falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30' 

* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
  vp3: Fix double free in vp3_decode_end()
  fate: Split fate-siff test into demuxer and VB video decoder test

Conflicts:
	tests/fate/demux.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.2
Michael Niedermayer 12 years ago
parent
3ac85bebd5 ec86ba5731
commit
8bfc8d88be
5 changed files with 126 additions and 15 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -9
      libavcodec/vp3.c
  2. +2
    -2
      tests/fate/demux.mak
  3. +3
    -0
      tests/fate/video.mak
  4. +112
    -0
      tests/ref/fate/siff-demux
  5. +0
    -4
      tests/ref/fate/vb

+ 9
- 9
libavcodec/vp3.c View File

@@ -281,15 +281,15 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx)
Vp3DecodeContext *s = avctx->priv_data; Vp3DecodeContext *s = avctx->priv_data;
int i; int i;


av_free(s->superblock_coding);
av_free(s->all_fragments);
av_free(s->coded_fragment_list[0]);
av_free(s->dct_tokens_base);
av_free(s->superblock_fragments);
av_free(s->macroblock_coding);
av_free(s->motion_val[0]);
av_free(s->motion_val[1]);
av_free(s->edge_emu_buffer);
av_freep(&s->superblock_coding);
av_freep(&s->all_fragments);
av_freep(&s->coded_fragment_list[0]);
av_freep(&s->dct_tokens_base);
av_freep(&s->superblock_fragments);
av_freep(&s->macroblock_coding);
av_freep(&s->motion_val[0]);
av_freep(&s->motion_val[1]);
av_freep(&s->edge_emu_buffer);


if (avctx->internal->is_copy) if (avctx->internal->is_copy)
return 0; return 0;


+ 2
- 2
tests/fate/demux.mak View File

@@ -73,8 +73,8 @@ fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux
fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy


FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff
fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24
FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux
fate-siff-demux: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -c copy


FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux
fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy


+ 3
- 0
tests/fate/video.mak View File

@@ -254,6 +254,9 @@ FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc
fate-v410enc: tests/vsynth1/00.pgm fate-v410enc: tests/vsynth1/00.pgm
fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi


FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb
fate-vb: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an

FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1 FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1
fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an




+ 112
- 0
tests/ref/fate/siff-demux View File

@@ -0,0 +1,112 @@
#tb 0: 1/12
#tb 1: 1/22050
0, 0, 0, 1, 15152, 0x14fc0f1f
1, 0, 0, 22050, 22050, 0xa7d60d27
0, 1, 1, 1, 15344, 0x31614bd7
0, 2, 2, 1, 15163, 0x88c46248
0, 3, 3, 1, 15152, 0x43c9c0e6
0, 4, 4, 1, 15341, 0x813f6f01
0, 5, 5, 1, 15152, 0x7598d01c
0, 6, 6, 1, 15152, 0x40b5cdb1
0, 7, 7, 1, 15347, 0xe061c843
0, 8, 8, 1, 15159, 0x2e3c2242
0, 9, 9, 1, 15151, 0x7201abc5
0, 10, 10, 1, 15346, 0xeb5a349e
0, 11, 11, 1, 15154, 0xda9907c9
0, 12, 12, 1, 15159, 0x8d4d63b0
1, 22050, 22050, 22050, 22050, 0xeb11185c
0, 13, 13, 1, 15337, 0xd988436d
0, 14, 14, 1, 15162, 0x0b495da7
0, 15, 15, 1, 15164, 0xd8837439
0, 16, 16, 1, 15339, 0x7ad372cc
0, 17, 17, 1, 15161, 0xc45d4590
0, 18, 18, 1, 15159, 0x5bdd9801
0, 19, 19, 1, 15335, 0x8e17c83e
0, 20, 20, 1, 15160, 0x5cdbdc04
0, 21, 21, 1, 15157, 0xf480a643
0, 22, 22, 1, 15346, 0x0c61b206
0, 23, 23, 1, 15160, 0x05d9acfd
0, 24, 24, 1, 15158, 0xebdc3ac4
1, 44100, 44100, 22050, 22050, 0xd6dc0e17
0, 25, 25, 1, 15334, 0xb51fd1b9
0, 26, 26, 1, 15152, 0x81f74e5c
0, 27, 27, 1, 15161, 0xafeca32c
0, 28, 28, 1, 15347, 0x8f5e5874
0, 29, 29, 1, 15157, 0xdeff353c
0, 30, 30, 1, 15160, 0x93a19aa0
0, 31, 31, 1, 15347, 0x94224071
0, 32, 32, 1, 15153, 0x9982aff5
0, 33, 33, 1, 15164, 0x044bcf2b
0, 34, 34, 1, 15347, 0x40aca6e9
0, 35, 35, 1, 15160, 0xf820e2c7
0, 36, 36, 1, 15154, 0x457832b5
1, 66150, 66150, 22050, 22050, 0x020412c4
0, 37, 37, 1, 15334, 0xbb1704f0
0, 38, 38, 1, 15156, 0xc0672ed1
0, 39, 39, 1, 15159, 0x9a82c7c1
0, 40, 40, 1, 15338, 0x03857aae
0, 41, 41, 1, 15158, 0xe6177548
0, 42, 42, 1, 15159, 0xf8ecafc4
0, 43, 43, 1, 15345, 0x0a10882e
0, 44, 44, 1, 15161, 0xec4339fb
0, 45, 45, 1, 15157, 0x071935a2
0, 46, 46, 1, 15340, 0x68aad418
0, 47, 47, 1, 15151, 0x891bc3fe
0, 48, 48, 1, 15153, 0xf522e54c
1, 88200, 88200, 22050, 22050, 0x5d9606ae
0, 49, 49, 1, 15346, 0x5a018842
0, 50, 50, 1, 15164, 0x6842ac50
0, 51, 51, 1, 15156, 0x32369159
0, 52, 52, 1, 15347, 0xf5be31aa
0, 53, 53, 1, 15157, 0xd2da28bd
0, 54, 54, 1, 15152, 0x389feda6
0, 55, 55, 1, 15345, 0x69187603
0, 56, 56, 1, 15154, 0x5dc60365
0, 57, 57, 1, 15159, 0x8c811193
0, 58, 58, 1, 15344, 0x3db4bf13
0, 59, 59, 1, 15156, 0xf729ebe1
0, 60, 60, 1, 15162, 0xf10a4ce5
1, 110250, 110250, 22050, 22050, 0x08171bca
0, 61, 61, 1, 15345, 0x749b0604
0, 62, 62, 1, 15160, 0xfe3bbbce
0, 63, 63, 1, 15160, 0x6dcc4b85
0, 64, 64, 1, 15337, 0xab87dd97
0, 65, 65, 1, 15163, 0x1ce60db8
0, 66, 66, 1, 15164, 0xfc4a2002
0, 67, 67, 1, 15345, 0x9108e072
0, 68, 68, 1, 15153, 0x83fc9055
0, 69, 69, 1, 15155, 0xa1101e1a
0, 70, 70, 1, 15343, 0x6418f0e9
0, 71, 71, 1, 15157, 0x8c743049
0, 72, 72, 1, 15153, 0x9c0e33eb
1, 132300, 132300, 22050, 22050, 0xd43b0cf9
0, 73, 73, 1, 15337, 0x64bae0b6
0, 74, 74, 1, 15162, 0x5f6b91d5
0, 75, 75, 1, 15162, 0x44e5dd3d
0, 76, 76, 1, 15342, 0x968dc44c
0, 77, 77, 1, 15158, 0x0e706c4d
0, 78, 78, 1, 15153, 0xa7d2199a
0, 79, 79, 1, 15345, 0x834d0f2e
0, 80, 80, 1, 15163, 0x3d5d38c3
0, 81, 81, 1, 15151, 0xf7d49515
0, 82, 82, 1, 15337, 0x5f362f2a
0, 83, 83, 1, 15162, 0xea87d814
0, 84, 84, 1, 15164, 0xeb0a2662
1, 154350, 154350, 22050, 22050, 0x486d1bc2
0, 85, 85, 1, 15340, 0x772109e6
0, 86, 86, 1, 15156, 0x9459cda5
0, 87, 87, 1, 15152, 0x4f174e2d
0, 88, 88, 1, 15343, 0x10d42a59
0, 89, 89, 1, 15162, 0xd65ec2ec
0, 90, 90, 1, 15156, 0x1e382319
0, 91, 91, 1, 15335, 0xec904c2a
0, 92, 92, 1, 15161, 0x56d49e44
0, 93, 93, 1, 15154, 0x51d02cd0
0, 94, 94, 1, 15340, 0xec3e14ee
0, 95, 95, 1, 15160, 0xe43b5305
0, 96, 96, 1, 15156, 0x8f2876a5
1, 176400, 176400, 22050, 22050, 0x5c5508d3
0, 97, 97, 1, 15340, 0xb26a9059
0, 98, 98, 1, 15156, 0xf9570ec0
0, 99, 99, 1, 15151, 0x862ffa1f
1, 198450, 198450, 1984, 1984, 0x9cb4dfb7

tests/ref/fate/siff → tests/ref/fate/vb View File

@@ -1,7 +1,5 @@
#tb 0: 1/12 #tb 0: 1/12
#tb 1: 1/22050
0, 0, 0, 1, 230400, 0x3bd1d731 0, 0, 0, 1, 230400, 0x3bd1d731
1, 0, 0, 22050, 44100, 0xd0a49e09
0, 1, 1, 1, 230400, 0x9d0774c3 0, 1, 1, 1, 230400, 0x9d0774c3
0, 2, 2, 1, 230400, 0xa0faafe2 0, 2, 2, 1, 230400, 0xa0faafe2
0, 3, 3, 1, 230400, 0x38325309 0, 3, 3, 1, 230400, 0x38325309
@@ -14,7 +12,6 @@
0, 10, 10, 1, 230400, 0xf52b8db4 0, 10, 10, 1, 230400, 0xf52b8db4
0, 11, 11, 1, 230400, 0x2b70c1dc 0, 11, 11, 1, 230400, 0x2b70c1dc
0, 12, 12, 1, 230400, 0x8157a6e9 0, 12, 12, 1, 230400, 0x8157a6e9
1, 22050, 22050, 22050, 44100, 0xf151af4d
0, 13, 13, 1, 230400, 0xd4a3c357 0, 13, 13, 1, 230400, 0xd4a3c357
0, 14, 14, 1, 230400, 0x703861bb 0, 14, 14, 1, 230400, 0x703861bb
0, 15, 15, 1, 230400, 0xa13cf75e 0, 15, 15, 1, 230400, 0xa13cf75e
@@ -27,7 +24,6 @@
0, 22, 22, 1, 230400, 0x0f5c8a0d 0, 22, 22, 1, 230400, 0x0f5c8a0d
0, 23, 23, 1, 230400, 0x3475df44 0, 23, 23, 1, 230400, 0x3475df44
0, 24, 24, 1, 230400, 0x65354e06 0, 24, 24, 1, 230400, 0x65354e06
1, 44100, 44100, 22050, 44100, 0xecd3cd08
0, 25, 25, 1, 230400, 0xb9a01978 0, 25, 25, 1, 230400, 0xb9a01978
0, 26, 26, 1, 230400, 0x15207ee1 0, 26, 26, 1, 230400, 0x15207ee1
0, 27, 27, 1, 230400, 0x3b214f0b 0, 27, 27, 1, 230400, 0x3b214f0b

Write Preview
Loading…
Cancel
Save