Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'

Browse Source 
* commit 'a7d2861d36756b913e85681b86ed3385274e8ced':
  svq3: K&R formatting cosmetics
  fate: Introduce ENCMUX macro for tests that require encoders and a muxer
  ffv1: Add missing #includes to header file

Conflicts:
	libavcodec/ffv1.h
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/6/merge
Michael Niedermayer 12 years ago
parent aa760b1735 a7d2861d36
commit 0e09761686
5 changed files with 457 additions and 396 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      libavcodec/ffv1.h
  2. 391
      libavcodec/svq3.c
  3. 1
      tests/Makefile
  4. 2
      tests/fate/avformat.mak
  5. 2
      tests/fate/seek.mak

7
libavcodec/ffv1.h
Unescape View File

@ -35,11 +35,12 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/timer.h" #include "libavutil/timer.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h"
#include "dsputil.h" #include "dsputil.h"
#include "rangecoder.h" #include "get_bits.h"
#include "golomb.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#include "put_bits.h"
#include "rangecoder.h"
#ifdef __INTEL_COMPILER #ifdef __INTEL_COMPILER
#undef av_flatten #undef av_flatten

391
libavcodec/svq3.c
Unescape View File

@ -80,13 +80,13 @@ typedef struct {
#define PREDICT_MODE 4 #define PREDICT_MODE 4
/* dual scan (from some older h264 draft) /* dual scan (from some older h264 draft)
o-->o-->o o * o-->o-->o o
| /| * | /|
o o o / o * o o o / o
| / | |/ | * | / | |/ |
o o o o * o o o o
/ * /
o-->o-->o-->o * o-->o-->o-->o
*/ */
static const uint8_t svq3_scan[16] = { static const uint8_t svq3_scan[16] = {
0 + 0 * 4, 1 + 0 * 4, 2 + 0 * 4, 2 + 1 * 4, 0 + 0 * 4, 1 + 0 * 4, 2 + 0 * 4, 2 + 1 * 4,
@ -122,7 +122,10 @@ static const int8_t svq3_pred_1[6][6][5] = {
{ 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } }, { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } },
}; };
static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = { static const struct {
uint8_t run;
uint8_t level;
} svq3_dct_tables[2][16] = {
{ { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 }, { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 },
{ 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } }, { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } },
{ { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 },
@ -136,7 +139,8 @@ static const uint32_t svq3_dequant_coeff[32] = {
61694, 68745, 77615, 89113, 100253, 109366, 126635, 141533 61694, 68745, 77615, 89113, 100253, 109366, 126635, 141533
}; };
void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *output, DCTELEM *input, int qp){ void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *output, DCTELEM *input, int qp)
{
const int qmul = svq3_dequant_coeff[qp]; const int qmul = svq3_dequant_coeff[qp];
#define stride 16 #define stride 16
int i; int i;
@ -170,14 +174,15 @@ void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *output, DCTELEM *input, int qp){
} }
#undef stride #undef stride
void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block,
int dc) int stride, int qp, int dc)
{ {
const int qmul = svq3_dequant_coeff[qp]; const int qmul = svq3_dequant_coeff[qp];
int i; int i;
if (dc) { if (dc) {
dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2)); dc = 13 * 13 * ((dc == 1) ? 1538 * block[0]
: ((qmul * (block[0] >> 3)) / 2));
block[0] = 0; block[0] = 0;
} }
@ -219,7 +224,6 @@ static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,
for (limit = (16 >> intra); index < 16; index = limit, limit += 8) { for (limit = (16 >> intra); index < 16; index = limit, limit += 8) {
for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) { for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) {
if (vlc < 0) if (vlc < 0)
return -1; return -1;
@ -250,6 +254,7 @@ static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,
} }
} }
if ((index += run) >= limit) if ((index += run) >= limit)
return -1; return -1;
@ -279,10 +284,8 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
if (mx < 0 || mx >= (s->h_edge_pos - width - 1) || if (mx < 0 || mx >= (s->h_edge_pos - width - 1) ||
my < 0 || my >= (s->v_edge_pos - height - 1)) { my < 0 || my >= (s->v_edge_pos - height - 1)) {
if ((s->flags & CODEC_FLAG_EMU_EDGE))
if ((s->flags & CODEC_FLAG_EMU_EDGE)) {
emu = 1; emu = 1;
}
mx = av_clip(mx, -16, (s->h_edge_pos - width + 15)); mx = av_clip(mx, -16, (s->h_edge_pos - width + 15));
my = av_clip(my, -16, (s->v_edge_pos - height + 15)); my = av_clip(my, -16, (s->v_edge_pos - height + 15));
@ -293,14 +296,19 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
src = pic->f.data[0] + mx + my * s->linesize; src = pic->f.data[0] + mx + my * s->linesize;
if (emu) { if (emu) {
s->dsp.emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1), s->dsp.emulated_edge_mc(s->edge_emu_buffer, src, s->linesize,
(width + 1), (height + 1),
mx, my, s->h_edge_pos, s->v_edge_pos); mx, my, s->h_edge_pos, s->v_edge_pos);
src = s->edge_emu_buffer; src = s->edge_emu_buffer;
} }
if (thirdpel) if (thirdpel)
(avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height); (avg ? s->dsp.avg_tpel_pixels_tab
: s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize,
width, height);
else else
(avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height); (avg ? s->dsp.avg_pixels_tab
: s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize,
height);
if (!(s->flags & CODEC_FLAG_GRAY)) { if (!(s->flags & CODEC_FLAG_GRAY)) {
mx = (mx + (mx < (int) x)) >> 1; mx = (mx + (mx < (int) x)) >> 1;
@ -314,20 +322,28 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
src = pic->f.data[i] + mx + my * s->uvlinesize; src = pic->f.data[i] + mx + my * s->uvlinesize;
if (emu) { if (emu) {
s->dsp.emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1), s->dsp.emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize,
mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1)); (width + 1), (height + 1),
mx, my, (s->h_edge_pos >> 1),
(s->v_edge_pos >> 1));
src = s->edge_emu_buffer; src = s->edge_emu_buffer;
} }
if (thirdpel) if (thirdpel)
(avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height); (avg ? s->dsp.avg_tpel_pixels_tab
: s->dsp.put_tpel_pixels_tab)[dxy](dest, src,
s->uvlinesize,
width, height);
else else
(avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height); (avg ? s->dsp.avg_pixels_tab
: s->dsp.put_pixels_tab)[blocksize][dxy](dest, src,
s->uvlinesize,
height);
} }
} }
} }
static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir, static inline int svq3_mc_dir(H264Context *h, int size, int mode,
int avg) int dir, int avg)
{ {
int i, j, k, mx, my, dx, dy, x, y; int i, j, k, mx, my, dx, dy, x, y;
MpegEncContext *const s = (MpegEncContext *)h; MpegEncContext *const s = (MpegEncContext *)h;
@ -337,13 +353,15 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
const int h_edge_pos = 6 * (s->h_edge_pos - part_width) - extra_width; const int h_edge_pos = 6 * (s->h_edge_pos - part_width) - extra_width;
const int v_edge_pos = 6 * (s->v_edge_pos - part_height) - extra_width; const int v_edge_pos = 6 * (s->v_edge_pos - part_height) - extra_width;
for (i = 0; i < 16; i += part_height) { for (i = 0; i < 16; i += part_height)
for (j = 0; j < 16; j += part_width) { for (j = 0; j < 16; j += part_width) {
const int b_xy = (4*s->mb_x + (j >> 2)) + (4*s->mb_y + (i >> 2))*h->b_stride; const int b_xy = (4 * s->mb_x + (j >> 2)) +
(4 * s->mb_y + (i >> 2)) * h->b_stride;
int dxy; int dxy;
x = 16 * s->mb_x + j; x = 16 * s->mb_x + j;
y = 16 * s->mb_y + i; y = 16 * s->mb_y + i;
k = ((j >> 2) & 1) + ((i >> 1) & 2) + ((j >> 1) & 4) + (i & 8); k = ((j >> 2) & 1) + ((i >> 1) & 2) +
((j >> 1) & 4) + (i & 8);
if (mode != PREDICT_MODE) { if (mode != PREDICT_MODE) {
pred_motion(h, k, (part_width >> 2), dir, 1, &mx, &my); pred_motion(h, k, (part_width >> 2), dir, 1, &mx, &my);
@ -352,11 +370,15 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
my = s->next_picture.f.motion_val[0][b_xy][1] << 1; my = s->next_picture.f.motion_val[0][b_xy][1] << 1;
if (dir == 0) { if (dir == 0) {
mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1; mx = ((mx * h->frame_num_offset) /
my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1; h->prev_frame_num_offset + 1) >> 1;
my = ((my * h->frame_num_offset) /
h->prev_frame_num_offset + 1) >> 1;
} else { } else {
mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1; mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) /
my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1; h->prev_frame_num_offset + 1) >> 1;
my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) /
h->prev_frame_num_offset + 1) >> 1;
} }
} }
@ -386,7 +408,8 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
fy = ((unsigned)(my + 0x3000)) / 3 - 0x1000; fy = ((unsigned)(my + 0x3000)) / 3 - 0x1000;
dxy = (mx - 3 * fx) + 4 * (my - 3 * fy); dxy = (mx - 3 * fx) + 4 * (my - 3 * fy);
svq3_mc_dir_part(s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg); svq3_mc_dir_part(s, x, y, part_width, part_height,
fx, fy, dxy, 1, dir, avg);
mx += mx; mx += mx;
my += my; my += my;
} else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) { } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) {
@ -394,14 +417,16 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
my = ((unsigned)(my + 1 + 0x3000)) / 3 + dy - 0x1000; my = ((unsigned)(my + 1 + 0x3000)) / 3 + dy - 0x1000;
dxy = (mx & 1) + 2 * (my & 1); dxy = (mx & 1) + 2 * (my & 1);
svq3_mc_dir_part(s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg); svq3_mc_dir_part(s, x, y, part_width, part_height,
mx >> 1, my >> 1, dxy, 0, dir, avg);
mx *= 3; mx *= 3;
my *= 3; my *= 3;
} else { } else {
mx = ((unsigned)(mx + 3 + 0x6000)) / 6 + dx - 0x1000; mx = ((unsigned)(mx + 3 + 0x6000)) / 6 + dx - 0x1000;
my = ((unsigned)(my + 3 + 0x6000)) / 6 + dy - 0x1000; my = ((unsigned)(my + 3 + 0x6000)) / 6 + dy - 0x1000;
svq3_mc_dir_part(s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg); svq3_mc_dir_part(s, x, y, part_width, part_height,
mx, my, 0, 0, dir, avg);
mx *= 6; mx *= 6;
my *= 6; my *= 6;
} }
@ -413,24 +438,20 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
if (part_height == 8 && i < 8) { if (part_height == 8 && i < 8) {
AV_WN32A(h->mv_cache[dir][scan8[k] + 1 * 8], mv); AV_WN32A(h->mv_cache[dir][scan8[k] + 1 * 8], mv);
if (part_width == 8 && j < 8) { if (part_width == 8 && j < 8)
AV_WN32A(h->mv_cache[dir][scan8[k] + 1 + 1 * 8], mv); AV_WN32A(h->mv_cache[dir][scan8[k] + 1 + 1 * 8], mv);
} }
} if (part_width == 8 && j < 8)
if (part_width == 8 && j < 8) {
AV_WN32A(h->mv_cache[dir][scan8[k] + 1], mv); AV_WN32A(h->mv_cache[dir][scan8[k] + 1], mv);
} if (part_width == 4 || part_height == 4)
if (part_width == 4 || part_height == 4) {
AV_WN32A(h->mv_cache[dir][scan8[k]], mv); AV_WN32A(h->mv_cache[dir][scan8[k]], mv);
} }
}
/* write back motion vectors */ /* write back motion vectors */
fill_rectangle(s->current_picture.f.motion_val[dir][b_xy], fill_rectangle(s->current_picture.f.motion_val[dir][b_xy],
part_width >> 2, part_height >> 2, h->b_stride, part_width >> 2, part_height >> 2, h->b_stride,
pack16to32(mx, my), 4); pack16to32(mx, my), 4);
} }
}
return 0; return 0;
} }
@ -451,12 +472,14 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
h->topright_samples_available = 0xFFFF; h->topright_samples_available = 0xFFFF;
if (mb_type == 0) { /* SKIP */ if (mb_type == 0) { /* SKIP */
if (s->pict_type == AV_PICTURE_TYPE_P || s->next_picture.f.mb_type[mb_xy] == -1) { if (s->pict_type == AV_PICTURE_TYPE_P ||
svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); s->next_picture.f.mb_type[mb_xy] == -1) {
svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
0, 0, 0, 0, 0, 0);
if (s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_B)
svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
} 0, 0, 0, 0, 1, 1);
mb_type = MB_TYPE_SKIP; mb_type = MB_TYPE_SKIP;
} else { } else {
@ -469,51 +492,57 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
mb_type = MB_TYPE_16x16; mb_type = MB_TYPE_16x16;
} }
} else if (mb_type < 8) { /* INTER */ } else if (mb_type < 8) { /* INTER */
if (svq3->thirdpel_flag && svq3->halfpel_flag == !get_bits1 (&s->gb)) { if (svq3->thirdpel_flag && svq3->halfpel_flag == !get_bits1(&s->gb))
mode = THIRDPEL_MODE; mode = THIRDPEL_MODE;
} else if (svq3->halfpel_flag && svq3->thirdpel_flag == !get_bits1 (&s->gb)) { else if (svq3->halfpel_flag &&
svq3->thirdpel_flag == !get_bits1(&s->gb))
mode = HALFPEL_MODE; mode = HALFPEL_MODE;
} else { else
mode = FULLPEL_MODE; mode = FULLPEL_MODE;
}
/* fill caches */ /* fill caches */
/* note ref_cache should contain here: /* note ref_cache should contain here:
???????? * ????????
???11111 * ???11111
N??11111 * N??11111
N??11111 * N??11111
N??11111 * N??11111
*/ */
for (m = 0; m < 2; m++) { for (m = 0; m < 2; m++) {
if (s->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) { if (s->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
AV_COPY32(h->mv_cache[m][scan8[0] - 1 + i*8], s->current_picture.f.motion_val[m][b_xy - 1 + i*h->b_stride]); AV_COPY32(h->mv_cache[m][scan8[0] - 1 + i * 8],
} s->current_picture.f.motion_val[m][b_xy - 1 + i * h->b_stride]);
} else { } else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
AV_ZERO32(h->mv_cache[m][scan8[0] - 1 + i * 8]); AV_ZERO32(h->mv_cache[m][scan8[0] - 1 + i * 8]);
} }
}
if (s->mb_y > 0) { if (s->mb_y > 0) {
memcpy(h->mv_cache[m][scan8[0] - 1*8], s->current_picture.f.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t)); memcpy(h->mv_cache[m][scan8[0] - 1 * 8],
memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4); s->current_picture.f.motion_val[m][b_xy - h->b_stride],
4 * 2 * sizeof(int16_t));
memset(&h->ref_cache[m][scan8[0] - 1 * 8],
(h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
if (s->mb_x < (s->mb_width - 1)) { if (s->mb_x < (s->mb_width - 1)) {
AV_COPY32(h->mv_cache[m][scan8[0] + 4 - 1*8], s->current_picture.f.motion_val[m][b_xy - h->b_stride + 4]); AV_COPY32(h->mv_cache[m][scan8[0] + 4 - 1 * 8],
s->current_picture.f.motion_val[m][b_xy - h->b_stride + 4]);
h->ref_cache[m][scan8[0] + 4 - 1 * 8] = h->ref_cache[m][scan8[0] + 4 - 1 * 8] =
(h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride + 1] + 6] == -1 || (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride + 1] + 6] == -1 ||
h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1; h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1;
} else } else
h->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE; h->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE;
if (s->mb_x > 0) { if (s->mb_x > 0) {
AV_COPY32(h->mv_cache[m][scan8[0] - 1 - 1*8], s->current_picture.f.motion_val[m][b_xy - h->b_stride - 1]); AV_COPY32(h->mv_cache[m][scan8[0] - 1 - 1 * 8],
h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] == -1) ? PART_NOT_AVAILABLE : 1; s->current_picture.f.motion_val[m][b_xy - h->b_stride - 1]);
h->ref_cache[m][scan8[0] - 1 - 1 * 8] =
(h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1;
} else } else
h->ref_cache[m][scan8[0] - 1 - 1 * 8] = PART_NOT_AVAILABLE; h->ref_cache[m][scan8[0] - 1 - 1 * 8] = PART_NOT_AVAILABLE;
} else } else
memset(&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); memset(&h->ref_cache[m][scan8[0] - 1 * 8 - 1],
PART_NOT_AVAILABLE, 8);
if (s->pict_type != AV_PICTURE_TYPE_B) if (s->pict_type != AV_PICTURE_TYPE_B)
break; break;
@ -528,17 +557,17 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
if (svq3_mc_dir(h, 0, mode, 0, 0) < 0) if (svq3_mc_dir(h, 0, mode, 0, 0) < 0)
return -1; return -1;
} else { } else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
memset(s->current_picture.f.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.f.motion_val[0][b_xy + i * h->b_stride],
} 0, 4 * 2 * sizeof(int16_t));
} }
if (mb_type != 1) { if (mb_type != 1) {
if (svq3_mc_dir(h, 0, mode, 1, (mb_type == 3)) < 0) if (svq3_mc_dir(h, 0, mode, 1, (mb_type == 3)) < 0)
return -1; return -1;
} else { } else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
memset(s->current_picture.f.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.f.motion_val[1][b_xy + i * h->b_stride],
} 0, 4 * 2 * sizeof(int16_t));
} }
} }
@ -548,23 +577,20 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
if (mb_type == 8) { if (mb_type == 8) {
if (s->mb_x > 0) { if (s->mb_x > 0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
h->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i]; h->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i];
} if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1)
if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) {
h->left_samples_available = 0x5F5F; h->left_samples_available = 0x5F5F;
} }
}
if (s->mb_y > 0) { if (s->mb_y > 0) {
h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 0]; h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 0];
h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 1]; h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 1];
h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 2]; h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 2];
h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 3]; h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 3];
if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { if (h->intra4x4_pred_mode_cache[4 + 8 * 0] == -1)
h->top_samples_available = 0x33FF; h->top_samples_available = 0x33FF;
} }
}
/* decode prediction codes for luma blocks */ /* decode prediction codes for luma blocks */
for (i = 0; i < 16; i += 2) { for (i = 0; i < 16; i += 2) {
@ -587,10 +613,9 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
} }
} }
} else { /* mb_type == 33, DC_128_PRED block type */ } else { /* mb_type == 33, DC_128_PRED block type */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_PRED, 4); memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_PRED, 4);
} }
}
write_back_intra_pred_mode(h); write_back_intra_pred_mode(h);
@ -600,9 +625,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
} else { } else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4); memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4);
}
h->top_samples_available = 0x33FF; h->top_samples_available = 0x33FF;
h->left_samples_available = 0x5F5F; h->left_samples_available = 0x5F5F;
@ -623,13 +647,13 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
} }
if (!IS_INTER(mb_type) && s->pict_type != AV_PICTURE_TYPE_I) { if (!IS_INTER(mb_type) && s->pict_type != AV_PICTURE_TYPE_I) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
memset(s->current_picture.f.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.f.motion_val[0][b_xy + i * h->b_stride],
} 0, 4 * 2 * sizeof(int16_t));
if (s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_B) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
memset(s->current_picture.f.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.f.motion_val[1][b_xy + i * h->b_stride],
} 0, 4 * 2 * sizeof(int16_t));
} }
} }
if (!IS_INTRA4x4(mb_type)) { if (!IS_INTRA4x4(mb_type)) {
@ -641,18 +665,21 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
s->dsp.clear_blocks(h->mb + 384); s->dsp.clear_blocks(h->mb + 384);
} }
if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B)) { if (!IS_INTRA16x16(mb_type) &&
(!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B)) {
if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48U){ if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48U){
av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
return -1; return -1;
} }
cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc]
: golomb_to_inter_cbp[vlc];
} }
if (IS_INTRA16x16(mb_type) || (s->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) { if (IS_INTRA16x16(mb_type) ||
(s->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
s->qscale += svq3_get_se_golomb(&s->gb); s->qscale += svq3_get_se_golomb(&s->gb);
if (s->qscale > 31U){ if (s->qscale > 31u) {
av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale); av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
return -1; return -1;
} }
@ -661,7 +688,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
AV_ZERO128(h->mb_luma_dc[0] + 0); AV_ZERO128(h->mb_luma_dc[0] + 0);
AV_ZERO128(h->mb_luma_dc[0] + 8); AV_ZERO128(h->mb_luma_dc[0] + 8);
if (svq3_decode_block(&s->gb, h->mb_luma_dc[0], 0, 1)) { if (svq3_decode_block(&s->gb, h->mb_luma_dc[0], 0, 1)) {
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); av_log(h->s.avctx, AV_LOG_ERROR,
"error while decoding intra luma dc\n");
return -1; return -1;
} }
} }
@ -670,27 +698,29 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
const int index = IS_INTRA16x16(mb_type) ? 1 : 0; const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
if ((cbp & (1 << i))) { if ((cbp & (1 << i))) {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j); k = index ? (1 * (j & 1) + 2 * (i & 1) +
2 * (j & 2) + 4 * (i & 2))
: (4 * i + j);
h->non_zero_count_cache[scan8[k]] = 1; h->non_zero_count_cache[scan8[k]] = 1;
if (svq3_decode_block(&s->gb, &h->mb[16 * k], index, type)) { if (svq3_decode_block(&s->gb, &h->mb[16 * k], index, type)) {
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n"); av_log(h->s.avctx, AV_LOG_ERROR,
"error while decoding block\n");
return -1; return -1;
} }
} }
} }
}
if ((cbp & 0x30)) { if ((cbp & 0x30)) {
for (i = 1; i < 3; ++i) { for (i = 1; i < 3; ++i)
if (svq3_decode_block(&s->gb, &h->mb[16 * 16 * i], 0, 3)) { if (svq3_decode_block(&s->gb, &h->mb[16 * 16 * i], 0, 3)) {
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); av_log(h->s.avctx, AV_LOG_ERROR,
"error while decoding chroma dc block\n");
return -1; return -1;
} }
}
if ((cbp & 0x20)) { if ((cbp & 0x20)) {
for (i = 1; i < 3; i++) { for (i = 1; i < 3; i++) {
@ -699,7 +729,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
h->non_zero_count_cache[scan8[k]] = 1; h->non_zero_count_cache[scan8[k]] = 1;
if (svq3_decode_block(&s->gb, &h->mb[16 * k], 1, 1)) { if (svq3_decode_block(&s->gb, &h->mb[16 * k], 1, 1)) {
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); av_log(h->s.avctx, AV_LOG_ERROR,
"error while decoding chroma ac block\n");
return -1; return -1;
} }
} }
@ -711,9 +742,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
h->cbp = cbp; h->cbp = cbp;
s->current_picture.f.mb_type[mb_xy] = mb_type; s->current_picture.f.mb_type[mb_xy] = mb_type;
if (IS_INTRA(mb_type)) { if (IS_INTRA(mb_type))
h->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1); h->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1);
}
return 0; return 0;
} }
@ -735,7 +765,9 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
} else { } else {
int length = (header >> 5) & 3; int length = (header >> 5) & 3;
svq3->next_slice_index = get_bits_count(&s->gb) + 8*show_bits(&s->gb, 8*length) + 8*length; svq3->next_slice_index = get_bits_count(&s->gb) +
8 * show_bits(&s->gb, 8 * length) +
8 * length;
if (svq3->next_slice_index > s->gb.size_in_bits) { if (svq3->next_slice_index > s->gb.size_in_bits) {
av_log(avctx, AV_LOG_ERROR, "slice after bitstream end\n"); av_log(avctx, AV_LOG_ERROR, "slice after bitstream end\n");
@ -747,7 +779,8 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
if (svq3->watermark_key) { if (svq3->watermark_key) {
uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1]); uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1]);
AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1], header ^ svq3->watermark_key); AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1],
header ^ svq3->watermark_key);
} }
if (length > 0) { if (length > 0) {
memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3],
@ -765,7 +798,8 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
if ((header & 0x9F) == 2) { if ((header & 0x9F) == 2) {
i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1)); i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
s->mb_skip_run = get_bits(&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width)); s->mb_skip_run = get_bits(&s->gb, i) -
(s->mb_x + (s->mb_y * s->mb_width));
} else { } else {
skip_bits1(&s->gb); skip_bits1(&s->gb);
s->mb_skip_run = 0; s->mb_skip_run = 0;
@ -778,29 +812,29 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
/* unknown fields */ /* unknown fields */
skip_bits1(&s->gb); skip_bits1(&s->gb);
if (svq3->unknown_flag) { if (svq3->unknown_flag)
skip_bits1(&s->gb); skip_bits1(&s->gb);
}
skip_bits1(&s->gb); skip_bits1(&s->gb);
skip_bits(&s->gb, 2); skip_bits(&s->gb, 2);
while (get_bits1(&s->gb)) { while (get_bits1(&s->gb))
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
}
/* reset intra predictors and invalidate motion vector references */ /* reset intra predictors and invalidate motion vector references */
if (s->mb_x > 0) { if (s->mb_x > 0) {
memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy - 1 ]+3, -1, 4*sizeof(int8_t)); memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - 1] + 3,
memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy - s->mb_x] , -1, 8*sizeof(int8_t)*s->mb_x); -1, 4 * sizeof(int8_t));
memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_x],
-1, 8 * sizeof(int8_t) * s->mb_x);
} }
if (s->mb_y > 0) { if (s->mb_y > 0) {
memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_stride],
-1, 8 * sizeof(int8_t) * (s->mb_width - s->mb_x));
if (s->mb_x > 0) { if (s->mb_x > 0)
h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] = -1; h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] = -1;
} }
}
return 0; return 0;
} }
@ -849,7 +883,6 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
/* if a match was found, parse the extra data */ /* if a match was found, parse the extra data */
if (marker_found) { if (marker_found) {
GetBitContext gb; GetBitContext gb;
int frame_size_code; int frame_size_code;
@ -861,13 +894,34 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
/* 'frame size code' and optional 'width, height' */ /* 'frame size code' and optional 'width, height' */
frame_size_code = get_bits(&gb, 3); frame_size_code = get_bits(&gb, 3);
switch (frame_size_code) { switch (frame_size_code) {
case 0: avctx->width = 160; avctx->height = 120; break; case 0:
case 1: avctx->width = 128; avctx->height = 96; break; avctx->width = 160;
case 2: avctx->width = 176; avctx->height = 144; break; avctx->height = 120;
case 3: avctx->width = 352; avctx->height = 288; break; break;
case 4: avctx->width = 704; avctx->height = 576; break; case 1:
case 5: avctx->width = 240; avctx->height = 180; break; avctx->width = 128;
case 6: avctx->width = 320; avctx->height = 240; break; avctx->height = 96;
break;
case 2:
avctx->width = 176;
avctx->height = 144;
break;
case 3:
avctx->width = 352;
avctx->height = 288;
break;
case 4:
avctx->width = 704;
avctx->height = 576;
break;
case 5:
avctx->width = 240;
avctx->height = 180;
break;
case 6:
avctx->width = 320;
avctx->height = 240;
break;
case 7: case 7:
avctx->width = get_bits(&gb, 12); avctx->width = get_bits(&gb, 12);
avctx->height = get_bits(&gb, 12); avctx->height = get_bits(&gb, 12);
@ -888,9 +942,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
/* unknown field */ /* unknown field */
skip_bits1(&gb); skip_bits1(&gb);
while (get_bits1(&gb)) { while (get_bits1(&gb))
skip_bits(&gb, 8); skip_bits(&gb, 8);
}
svq3->unknown_flag = get_bits1(&gb); svq3->unknown_flag = get_bits1(&gb);
avctx->has_b_frames = !s->low_delay; avctx->has_b_frames = !s->low_delay;
@ -902,7 +955,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
int u2 = get_bits(&gb, 8); int u2 = get_bits(&gb, 8);
int u3 = get_bits(&gb, 2); int u3 = get_bits(&gb, 2);
int u4 = svq3_get_ue_golomb(&gb); int u4 = svq3_get_ue_golomb(&gb);
unsigned long buf_len = watermark_width*watermark_height*4; unsigned long buf_len = watermark_width *
watermark_height * 4;
int offset = (get_bits_count(&gb) + 7) >> 3; int offset = (get_bits_count(&gb) + 7) >> 3;
uint8_t *buf; uint8_t *buf;
@ -910,19 +964,27 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
return -1; return -1;
buf = av_malloc(buf_len); buf = av_malloc(buf_len);
av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", watermark_width, watermark_height); av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n",
av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", u1, u2, u3, u4, offset); watermark_width, watermark_height);
if (uncompress(buf, &buf_len, extradata + 8 + offset, size - offset) != Z_OK) { av_log(avctx, AV_LOG_DEBUG,
av_log(avctx, AV_LOG_ERROR, "could not uncompress watermark logo\n"); "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n",
u1, u2, u3, u4, offset);
if (uncompress(buf, &buf_len, extradata + 8 + offset,
size - offset) != Z_OK) {
av_log(avctx, AV_LOG_ERROR,
"could not uncompress watermark logo\n");
av_free(buf); av_free(buf);
return -1; return -1;
} }
svq3->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0); svq3->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
svq3->watermark_key = svq3->watermark_key << 16 | svq3->watermark_key; svq3->watermark_key = svq3->watermark_key << 16 |
av_log(avctx, AV_LOG_DEBUG, "watermark key %#x\n", svq3->watermark_key); svq3->watermark_key;
av_log(avctx, AV_LOG_DEBUG,
"watermark key %#x\n", svq3->watermark_key);
av_free(buf); av_free(buf);
#else #else
av_log(avctx, AV_LOG_ERROR, "this svq3 file contains watermark which need zlib support compiled in\n"); av_log(avctx, AV_LOG_ERROR,
"this svq3 file contains watermark which need zlib support compiled in\n");
return -1; return -1;
#endif #endif
} }
@ -945,9 +1007,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int svq3_decode_frame(AVCodecContext *avctx, static int svq3_decode_frame(AVCodecContext *avctx, void *data,
void *data, int *data_size, int *data_size, AVPacket *avpkt)
AVPacket *avpkt)
{ {
SVQ3Context *svq3 = avctx->priv_data; SVQ3Context *svq3 = avctx->priv_data;
H264Context *h = &svq3->h; H264Context *h = &svq3->h;
@ -987,11 +1048,12 @@ static int svq3_decode_frame(AVCodecContext *avctx,
s->pict_type = h->slice_type; s->pict_type = h->slice_type;
s->picture_number = h->slice_num; s->picture_number = h->slice_num;
if (avctx->debug&FF_DEBUG_PICT_INFO){ if (avctx->debug & FF_DEBUG_PICT_INFO)
av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", av_log(h->s.avctx, AV_LOG_DEBUG,
av_get_picture_type_char(s->pict_type), svq3->halfpel_flag, svq3->thirdpel_flag, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
av_get_picture_type_char(s->pict_type),
svq3->halfpel_flag, svq3->thirdpel_flag,
s->adaptive_quant, s->qscale, h->slice_num); s->adaptive_quant, s->qscale, h->slice_num);
}
/* for skipping the frame */ /* for skipping the frame */
s->current_picture.f.pict_type = s->pict_type; s->current_picture.f.pict_type = s->pict_type;
@ -1000,9 +1062,9 @@ static int svq3_decode_frame(AVCodecContext *avctx,
/* Skip B-frames if we do not have reference frames. */ /* Skip B-frames if we do not have reference frames. */
if (s->last_picture_ptr == NULL && s->pict_type == AV_PICTURE_TYPE_B) if (s->last_picture_ptr == NULL && s->pict_type == AV_PICTURE_TYPE_B)
return 0; return 0;
if ( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) ||
||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) ||
|| avctx->skip_frame >= AVDISCARD_ALL) avctx->skip_frame >= AVDISCARD_ALL)
return 0; return 0;
if (s->next_p_frame_damaged) { if (s->next_p_frame_damaged) {
@ -1018,10 +1080,10 @@ static int svq3_decode_frame(AVCodecContext *avctx,
if (s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_B) {
h->frame_num_offset = (h->slice_num - h->prev_frame_num); h->frame_num_offset = (h->slice_num - h->prev_frame_num);
if (h->frame_num_offset < 0) { if (h->frame_num_offset < 0)
h->frame_num_offset += 256; h->frame_num_offset += 256;
} if (h->frame_num_offset == 0 ||
if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) { h->frame_num_offset >= h->prev_frame_num_offset) {
av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n"); av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
return -1; return -1;
} }
@ -1030,10 +1092,9 @@ static int svq3_decode_frame(AVCodecContext *avctx,
h->frame_num = h->slice_num; h->frame_num = h->slice_num;
h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num); h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num);
if (h->prev_frame_num_offset < 0) { if (h->prev_frame_num_offset < 0)
h->prev_frame_num_offset += 256; h->prev_frame_num_offset += 256;
} }
}
for (m = 0; m < 2; m++) { for (m = 0; m < 2; m++) {
int i; int i;
@ -1051,8 +1112,8 @@ static int svq3_decode_frame(AVCodecContext *avctx,
h->mb_xy = s->mb_x + s->mb_y * s->mb_stride; h->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
if ((get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && if ((get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
((get_bits_count(&s->gb) & 7) == 0 || show_bits(&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { ((get_bits_count(&s->gb) & 7) == 0 ||
show_bits(&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) {
skip_bits(&s->gb, svq3->next_slice_index - get_bits_count(&s->gb)); skip_bits(&s->gb, svq3->next_slice_index - get_bits_count(&s->gb));
s->gb.size_in_bits = 8 * buf_size; s->gb.size_in_bits = 8 * buf_size;
@ -1064,25 +1125,23 @@ static int svq3_decode_frame(AVCodecContext *avctx,
mb_type = svq3_get_ue_golomb(&s->gb); mb_type = svq3_get_ue_golomb(&s->gb);
if (s->pict_type == AV_PICTURE_TYPE_I) { if (s->pict_type == AV_PICTURE_TYPE_I)
mb_type += 8; mb_type += 8;
} else if (s->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4) { else if (s->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
mb_type += 4; mb_type += 4;
}
if ((unsigned)mb_type > 33 || svq3_decode_mb(svq3, mb_type)) { if ((unsigned)mb_type > 33 || svq3_decode_mb(svq3, mb_type)) {
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); av_log(h->s.avctx, AV_LOG_ERROR,
"error while decoding MB %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
} }
if (mb_type != 0) { if (mb_type != 0)
ff_h264_hl_decode_mb(h); ff_h264_hl_decode_mb(h);
}
if (s->pict_type != AV_PICTURE_TYPE_B && !s->low_delay) { if (s->pict_type != AV_PICTURE_TYPE_B && !s->low_delay)
s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride] = s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
(s->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1; (s->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
} }
}
ff_draw_horiz_band(s, 16 * s->mb_y, 16); ff_draw_horiz_band(s, 16 * s->mb_y, 16);
} }
@ -1101,16 +1160,14 @@ static int svq3_decode_frame(AVCodecContext *avctx,
ff_MPV_frame_end(s); ff_MPV_frame_end(s);
if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)
*(AVFrame *)data = s->current_picture.f; *(AVFrame *)data = s->current_picture.f;
} else { else
*(AVFrame *)data = s->last_picture.f; *(AVFrame *)data = s->last_picture.f;
}
/* Do not output the last pic after seeking. */ /* Do not output the last pic after seeking. */
if (s->last_picture_ptr || s->low_delay) { if (s->last_picture_ptr || s->low_delay)
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
}
return buf_size; return buf_size;
} }
@ -1139,8 +1196,10 @@ AVCodec ff_svq3_decoder = {
.init = svq3_decode_init, .init = svq3_decode_init,
.close = svq3_decode_end, .close = svq3_decode_end,
.decode = svq3_decode_frame, .decode = svq3_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | .capabilities = CODEC_CAP_DRAW_HORIZ_BAND |
CODEC_CAP_DR1 |
CODEC_CAP_DELAY, CODEC_CAP_DELAY,
.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"),
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P,
AV_PIX_FMT_NONE},
}; };

1
tests/Makefile
Unescape View File

@ -55,6 +55,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
$(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER)
DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
ENCMUX = $(call ALLYES, $(2:%=%_ENCODER) $(1)_MUXER)
include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/acodec.mak
include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak

2
tests/fate/avformat.mak
Unescape View File

@ -29,7 +29,7 @@ FATE_LAVF-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
FATE_LAVF-$(call ENCDEC, PNG, IMAGE2) += png FATE_LAVF-$(call ENCDEC, PNG, IMAGE2) += png
FATE_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm FATE_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm
FATE_LAVF-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe FATE_LAVF-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
FATE_LAVF-$(call ALLYES, RV10_ENCODER AC3_FIXED_ENCODER RM_MUXER) += rm FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso
FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
FATE_LAVF-$(call ENCDEC, PCM_S16LE, SOX) += sox FATE_LAVF-$(call ENCDEC, PCM_S16LE, SOX) += sox

2
tests/fate/seek.mak
Unescape View File

@ -100,7 +100,7 @@ FATE_SEEK-$(call ENCDEC, PGM, IMAGE2) += image_pgm
FATE_SEEK-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe_pgm FATE_SEEK-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe_pgm
FATE_SEEK-$(call ENCDEC, PPM, IMAGE2) += image_ppm FATE_SEEK-$(call ENCDEC, PPM, IMAGE2) += image_ppm
FATE_SEEK-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe_ppm FATE_SEEK-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe_ppm
FATE_SEEK-$(call ALLYES, RV10_ENCODER AC3_FIXED_ENCODER RM_MUXER) += lavf_rm FATE_SEEK-$(call ENCMUX, RV10 AC3_FIXED, RM) += lavf_rm
FATE_SEEK-$(call ENCDEC, SGI, IMAGE2) += image_sgi FATE_SEEK-$(call ENCDEC, SGI, IMAGE2) += image_sgi
FATE_SEEK-$(call ENCDEC, FLV, SWF) += lavf_swf FATE_SEEK-$(call ENCDEC, FLV, SWF) += lavf_swf
FATE_SEEK-$(call ENCDEC, TARGA, IMAGE2) += image_tga FATE_SEEK-$(call ENCDEC, TARGA, IMAGE2) += image_tga

Write Preview
Loading…
Cancel
Save