From 0f94c0b1b68a751a9e35293e723677338ecd1e90 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 1 Dec 2012 19:31:25 +0100 Subject: [PATCH 1/2] fate: vp3: Fix fate-vp3-coeff-level64 test dependencies Also rename the test to reflect that the video track is Theora, not VP3. --- tests/fate/vpx.mak | 8 ++++---- .../ref/fate/{vp3-coeff-level64 => theora-coeff-level64} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename tests/ref/fate/{vp3-coeff-level64 => theora-coeff-level64} (100%) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 4f20e271da..b881c0a31c 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,10 +1,10 @@ -FATE_VP3-$(CONFIG_MATROSKA_DEMUXER) += fate-vp3-coeff-level64 -fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv +FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64 +fate-theora-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv -FATE_VP3-$(CONFIG_AVI_DEMUXER) += fate-vp31 +FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi -FATE_SAMPLES_AVCONV-$(CONFIG_VP3_DECODER) += $(FATE_VP3-yes) +FATE_SAMPLES_AVCONV += $(FATE_VP3-yes) fate-vp3: $(FATE_VP3-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 diff --git a/tests/ref/fate/vp3-coeff-level64 b/tests/ref/fate/theora-coeff-level64 similarity index 100% rename from tests/ref/fate/vp3-coeff-level64 rename to tests/ref/fate/theora-coeff-level64 From abae27ed3acd0a7c54f11760c5be2d2653c4edf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 10 Jan 2013 16:40:12 +0200 Subject: [PATCH 2/2] rtpdec: Fix the calculation of expected number of packets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The base_seq variable is set to first_seq - 1 (in rtp_init_sequence), so no + 1 is needed here. This avoids reporting 1 lost packet from the start. Signed-off-by: Martin Storsjö --- libavformat/rtpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 9cc53e2591..20c11c73cf 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -273,7 +273,7 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, // some placeholders we should really fill... // RFC 1889/p64 extended_max = stats->cycles + stats->max_seq; - expected = extended_max - stats->base_seq + 1; + expected = extended_max - stats->base_seq; lost = expected - stats->received; lost = FFMIN(lost, 0xffffff); // clamp it since it's only 24 bits... expected_interval = expected - stats->expected_prior;