summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <david.schleef@rd.io>2013-11-07 15:02:08 -0800
committerDavid Schleef <david.schleef@rd.io>2013-11-17 14:28:00 -0800
commit143419731a296c3ab521bfc90fd40c82fb0fdcce (patch)
tree75e06cb0dbadeee3f68a5a9b42eeaea308647a7d
parent7ce9cc0bd06e821f4e02326c37ebccfa11635658 (diff)
adaptive: Add segmentAlignment=true
-rw-r--r--gst-streaming-server/gss-adaptive.c2
-rwxr-xr-xtests/test.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/gst-streaming-server/gss-adaptive.c b/gst-streaming-server/gss-adaptive.c
index 0ce0c82..111ae91 100644
--- a/gst-streaming-server/gss-adaptive.c
+++ b/gst-streaming-server/gss-adaptive.c
@@ -317,6 +317,7 @@ gss_adaptive_resource_get_dash_range_mpd (GssTransaction * t,
GSS_A (" <AdaptationSet mimeType=\"audio/mp4\" "
"lang=\"en\" "
+ "segmentAlignment=\"true\" "
"subsegmentAlignment=\"true\" " "subsegmentStartsWithSAP=\"1\">\n");
append_content_protection (t, adaptive, mq.auth_token);
for (i = 0; i < adaptive->n_audio_levels; i++) {
@@ -337,6 +338,7 @@ gss_adaptive_resource_get_dash_range_mpd (GssTransaction * t,
GSS_A (" </AdaptationSet>\n");
GSS_A (" <AdaptationSet mimeType=\"video/mp4\" "
+ "segmentAlignment=\"true\" "
"subsegmentAlignment=\"true\" " "subsegmentStartsWithSAP=\"1\">\n");
append_content_protection (t, adaptive, mq.auth_token);
for (i = 0; i < adaptive->n_video_levels; i++) {
diff --git a/tests/test.py b/tests/test.py
index 6e640cd..122a1f2 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -116,7 +116,7 @@ if clear_enabled:
test_get_status("/vod/elephantsdream/0/clear/ism/content?stream=video&bitrate=752428", 404)
test_get_status("/vod/elephantsdream/0/clear/ism/content?stream=video&start_time=0", 404)
-test_get_checksum("/vod/elephantsdream/0/pr/isoff-ondemand/manifest.mpd", "1cadb2a7e7c17b36afc3aef149a33c29deaeee61")
+test_get_checksum("/vod/elephantsdream/0/pr/isoff-ondemand/manifest.mpd", "52d8235723abe4256fdf4f5b0e36c1723d9fbe51")
test_get_checksum_range("/vod/elephantsdream/0/pr/isoff-ondemand/content/v0", 0, 655, "a43a1f9b3dba34bcb98d30528e1e828514f4beb3")
test_get_checksum_range("/vod/elephantsdream/0/pr/isoff-ondemand/content/v0", 656, 2247, "22aaa93c0732299c523fc9a8640052d40c74604e")
test_get_checksum_range("/vod/elephantsdream/0/pr/isoff-ondemand/content/v0", 2248, 432537, "00dfe3aeca60abee5be5eb1274ead41707cf04d1")
@@ -125,7 +125,7 @@ test_get_checksum_range("/vod/elephantsdream/0/pr/isoff-ondemand/content/a0", 59
test_get_checksum_range("/vod/elephantsdream/0/pr/isoff-ondemand/content/a0", 2190, 85915, "e45ac47f528379452fe22e2c9ce4491d5ae084db")
if clear_enabled:
- test_get_checksum("/vod/elephantsdream/0/clear/isoff-ondemand/manifest.mpd", "ea1d9a8e43384406459487b6141241017ee74a27")
+ test_get_checksum("/vod/elephantsdream/0/clear/isoff-ondemand/manifest.mpd", "3d049e6aee62576cf0f72f5f22c782ee62999a08")
test_get_checksum_range("/vod/elephantsdream/0/clear/isoff-ondemand/content/v0", 0, 655, "2f33c2079803b2657d23fb1e16e5fa85f9a349bc")
test_get_checksum_range("/vod/elephantsdream/0/clear/isoff-ondemand/content/v0", 656, 2247, "8615fb80b24584c4403ff884ef837cf0ec43ac52")
test_get_checksum_range("/vod/elephantsdream/0/clear/isoff-ondemand/content/v0", 2248, 432537, "0feb611df81f58b56c0fe1c1fc13cd51565224a6")