Skip to content

F
ffmpeg.wasm-core
Commit 3a1df52e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  Pretty-print RV3/4 decoder source
  Saner RV1/2 initialisation and RV2 header parsing.

Conflicts:
	libavcodec/rv10.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents aae1c247 7351eb14
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 178 deletions
libavcodec/rv10.c
View file @ 3a1df52e
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
//#define DEBUG //#define DEBUG
#define RV_GET_MAJOR_VER(x) ((x) >> 28)
#define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)
#define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF)
#define DC_VLC_BITS 14 //FIXME find a better solution #define DC_VLC_BITS 14 //FIXME find a better solution
static const uint16_t rv_lum_code[256] = static const uint16_t rv_lum_code[256] =
...@@ -292,6 +296,7 @@ static int rv10_decode_picture_header(MpegEncContext *s) ...@@ -292,6 +296,7 @@ static int rv10_decode_picture_header(MpegEncContext *s)
static int rv20_decode_picture_header(MpegEncContext *s) static int rv20_decode_picture_header(MpegEncContext *s)
{ {
int seq, mb_pos, i; int seq, mb_pos, i;
int rpr_bits;
#if 0 #if 0
GetBitContext gb= s->gb; GetBitContext gb= s->gb;
...@@ -310,13 +315,6 @@ static int rv20_decode_picture_header(MpegEncContext *s) ...@@ -310,13 +315,6 @@ static int rv20_decode_picture_header(MpegEncContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "\n"); av_log(s->avctx, AV_LOG_DEBUG, "\n");
#endif #endif
if(s->avctx->sub_id == 0x30202002 || s->avctx->sub_id == 0x30203002){
if (get_bits(&s->gb, 3)){
av_log(s->avctx, AV_LOG_ERROR, "unknown triplet set\n");
return -1;
}
}
i= get_bits(&s->gb, 2); i= get_bits(&s->gb, 2);
switch(i){ switch(i){
case 0: s->pict_type= AV_PICTURE_TYPE_I; break; case 0: s->pict_type= AV_PICTURE_TYPE_I; break;
...@@ -334,7 +332,7 @@ static int rv20_decode_picture_header(MpegEncContext *s) ...@@ -334,7 +332,7 @@ static int rv20_decode_picture_header(MpegEncContext *s)
} }
if (get_bits1(&s->gb)){ if (get_bits1(&s->gb)){
av_log(s->avctx, AV_LOG_ERROR, "unknown bit set\n"); av_log(s->avctx, AV_LOG_ERROR, "reserved bit set\n");
return -1; return -1;
} }
...@@ -343,23 +341,21 @@ static int rv20_decode_picture_header(MpegEncContext *s) ...@@ -343,23 +341,21 @@ static int rv20_decode_picture_header(MpegEncContext *s)
av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n"); av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n");
return -1; return -1;
} }
if(s->avctx->sub_id == 0x30203002){
if (get_bits1(&s->gb)){
av_log(s->avctx, AV_LOG_ERROR, "unknown bit2 set\n");
return -1;
}
}
if(s->avctx->has_b_frames){ if(RV_GET_MINOR_VER(s->avctx->sub_id) >= 2)
int f, new_w, new_h; s->loop_filter = get_bits1(&s->gb);
int v= s->avctx->extradata_size >= 4 ? 7&((uint8_t*)s->avctx->extradata)[1] : 0;
if (get_bits1(&s->gb)){ if(RV_GET_MINOR_VER(s->avctx->sub_id) <= 1)
av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); seq = get_bits(&s->gb, 8) << 7;
} else
seq= get_bits(&s->gb, 13)<<2; seq = get_bits(&s->gb, 13) << 2;
rpr_bits = s->avctx->extradata[1] & 7;
if(rpr_bits){
int f, new_w, new_h;
rpr_bits = FFMIN((rpr_bits >> 1) + 1, 3);
f= get_bits(&s->gb, av_log2(v)+1); f = get_bits(&s->gb, rpr_bits);
if(f){ if(f){
new_w= 4*((uint8_t*)s->avctx->extradata)[6+2*f]; new_w= 4*((uint8_t*)s->avctx->extradata)[6+2*f];
...@@ -381,19 +377,12 @@ static int rv20_decode_picture_header(MpegEncContext *s) ...@@ -381,19 +377,12 @@ static int rv20_decode_picture_header(MpegEncContext *s)
} }
if(s->avctx->debug & FF_DEBUG_PICT_INFO){ if(s->avctx->debug & FF_DEBUG_PICT_INFO){
av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, v); av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits);
} }
}else{
seq= get_bits(&s->gb, 8)*128;
} }
// if(s->avctx->sub_id <= 0x20201002){ //0x20201002 definitely needs this mb_pos = ff_h263_decode_mba(s);
mb_pos= ff_h263_decode_mba(s);
/* }else{
mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
s->mb_x= mb_pos % s->mb_width;
s->mb_y= mb_pos / s->mb_width;
}*/
//av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq); //av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq);
seq |= s->time &~0x7FFF; seq |= s->time &~0x7FFF;
if(seq - s->time > 0x4000) seq -= 0x8000; if(seq - s->time > 0x4000) seq -= 0x8000;
...@@ -420,6 +409,9 @@ static int rv20_decode_picture_header(MpegEncContext *s) ...@@ -420,6 +409,9 @@ static int rv20_decode_picture_header(MpegEncContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "\n");*/ av_log(s->avctx, AV_LOG_DEBUG, "\n");*/
s->no_rounding= get_bits1(&s->gb); s->no_rounding= get_bits1(&s->gb);
if(RV_GET_MINOR_VER(s->avctx->sub_id) <= 1 && s->pict_type == AV_PICTURE_TYPE_B)
skip_bits(&s->gb, 5); // binary decoder reads 3+2 bits here but they don't seem to be used
s->f_code = 1; s->f_code = 1;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->h263_aic= s->pict_type == AV_PICTURE_TYPE_I; s->h263_aic= s->pict_type == AV_PICTURE_TYPE_I;
...@@ -444,6 +436,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) ...@@ -444,6 +436,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
{ {
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
static int done=0; static int done=0;
int major_ver, minor_ver, micro_ver;
if (avctx->extradata_size < 8) { if (avctx->extradata_size < 8) {
av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n"); av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n");
...@@ -462,32 +455,27 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) ...@@ -462,32 +455,27 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
s->h263_long_vectors= ((uint8_t*)avctx->extradata)[3] & 1; s->h263_long_vectors= ((uint8_t*)avctx->extradata)[3] & 1;
avctx->sub_id= AV_RB32((uint8_t*)avctx->extradata + 4); avctx->sub_id= AV_RB32((uint8_t*)avctx->extradata + 4);
if (avctx->sub_id == 0x10000000) { major_ver = RV_GET_MAJOR_VER(avctx->sub_id);
s->rv10_version= 0; minor_ver = RV_GET_MINOR_VER(avctx->sub_id);
s->low_delay=1; micro_ver = RV_GET_MICRO_VER(avctx->sub_id);
} else if (avctx->sub_id == 0x10001000) {
s->rv10_version= 3; s->low_delay = 1;
s->low_delay=1; switch (major_ver) {
} else if (avctx->sub_id == 0x10002000) { case 1:
s->rv10_version= 3; s->rv10_version = micro_ver ? 3 : 1;
s->low_delay=1; s->obmc = micro_ver == 2;
s->obmc=1; break;
} else if (avctx->sub_id == 0x10003000) { case 2:
s->rv10_version= 3; if (minor_ver >= 2) {
s->low_delay=1; s->low_delay = 0;
} else if (avctx->sub_id == 0x10003001) { s->avctx->has_b_frames = 1;
s->rv10_version= 3; }
s->low_delay=1; break;
} else if ( avctx->sub_id == 0x20001000 default:
|| (avctx->sub_id >= 0x20100000 && avctx->sub_id < 0x201a0000)) {
s->low_delay=1;
} else if ( avctx->sub_id == 0x30202002
|| avctx->sub_id == 0x30203002
|| (avctx->sub_id >= 0x20200002 && avctx->sub_id < 0x20300000)) {
s->low_delay=0;
s->avctx->has_b_frames=1;
} else
av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", avctx->sub_id); av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", avctx->sub_id);
av_log_missing_feature(avctx, "RV1/2 version", 1);
return AVERROR_PATCHWELCOME;
}
if(avctx->debug & FF_DEBUG_PICT_INFO){ if(avctx->debug & FF_DEBUG_PICT_INFO){
av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1); av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1);
......
libavcodec/rv30.c
View file @ 3a1df52e
...@@ -275,7 +275,7 @@ AVCodec ff_rv30_decoder = { ...@@ -275,7 +275,7 @@ AVCodec ff_rv30_decoder = {
.close = ff_rv34_decode_end, .close = ff_rv34_decode_end,
.decode = ff_rv34_decode_frame, .decode = ff_rv34_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"),
.pix_fmts= ff_pixfmt_list_420, .pix_fmts = ff_pixfmt_list_420,
}; };
libavcodec/rv30dsp.c
View file @ 3a1df52e
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
#define RV30_LOWPASS(OPNAME, OP) \ #define RV30_LOWPASS(OPNAME, OP) \
static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
const int h=8;\ const int h = 8;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\ int i;\
for(i=0; i<h; i++)\ for(i = 0; i < h; i++)\
{\ {\
OP(dst[0], (-(src[-1]+src[2]) + src[0]*C1 + src[1]*C2 + 8)>>4);\ OP(dst[0], (-(src[-1]+src[2]) + src[0]*C1 + src[1]*C2 + 8)>>4);\
OP(dst[1], (-(src[ 0]+src[3]) + src[1]*C1 + src[2]*C2 + 8)>>4);\ OP(dst[1], (-(src[ 0]+src[3]) + src[1]*C1 + src[2]*C2 + 8)>>4);\
...@@ -42,28 +42,28 @@ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, ...@@ -42,28 +42,28 @@ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src,
OP(dst[5], (-(src[ 4]+src[7]) + src[5]*C1 + src[6]*C2 + 8)>>4);\ OP(dst[5], (-(src[ 4]+src[7]) + src[5]*C1 + src[6]*C2 + 8)>>4);\
OP(dst[6], (-(src[ 5]+src[8]) + src[6]*C1 + src[7]*C2 + 8)>>4);\ OP(dst[6], (-(src[ 5]+src[8]) + src[6]*C1 + src[7]*C2 + 8)>>4);\
OP(dst[7], (-(src[ 6]+src[9]) + src[7]*C1 + src[8]*C2 + 8)>>4);\ OP(dst[7], (-(src[ 6]+src[9]) + src[7]*C1 + src[8]*C2 + 8)>>4);\
dst+=dstStride;\ dst += dstStride;\
src+=srcStride;\ src += srcStride;\
}\ }\
}\ }\
\ \
static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
const int w=8;\ const int w = 8;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\ int i;\
for(i=0; i<w; i++)\ for(i = 0; i < w; i++)\
{\ {\
const int srcA= src[-1*srcStride];\ const int srcA = src[-1*srcStride];\
const int src0= src[0 *srcStride];\ const int src0 = src[0 *srcStride];\
const int src1= src[1 *srcStride];\ const int src1 = src[1 *srcStride];\
const int src2= src[2 *srcStride];\ const int src2 = src[2 *srcStride];\
const int src3= src[3 *srcStride];\ const int src3 = src[3 *srcStride];\
const int src4= src[4 *srcStride];\ const int src4 = src[4 *srcStride];\
const int src5= src[5 *srcStride];\ const int src5 = src[5 *srcStride];\
const int src6= src[6 *srcStride];\ const int src6 = src[6 *srcStride];\
const int src7= src[7 *srcStride];\ const int src7 = src[7 *srcStride];\
const int src8= src[8 *srcStride];\ const int src8 = src[8 *srcStride];\
const int src9= src[9 *srcStride];\ const int src9 = src[9 *srcStride];\
OP(dst[0*dstStride], (-(srcA+src2) + src0*C1 + src1*C2 + 8)>>4);\ OP(dst[0*dstStride], (-(srcA+src2) + src0*C1 + src1*C2 + 8)>>4);\
OP(dst[1*dstStride], (-(src0+src3) + src1*C1 + src2*C2 + 8)>>4);\ OP(dst[1*dstStride], (-(src0+src3) + src1*C1 + src2*C2 + 8)>>4);\
OP(dst[2*dstStride], (-(src1+src4) + src2*C1 + src3*C2 + 8)>>4);\ OP(dst[2*dstStride], (-(src1+src4) + src2*C1 + src3*C2 + 8)>>4);\
......
libavcodec/rv34.c
View file @ 3a1df52e
...@@ -181,16 +181,16 @@ static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block) ...@@ -181,16 +181,16 @@ static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block)
{ {
int i; int i;
for(i=0; i<4; i++){ for(i = 0; i < 4; i++){
const int z0= 13*(block[i+8*0] + block[i+8*2]); const int z0 = 13*(block[i+8*0] + block[i+8*2]);
const int z1= 13*(block[i+8*0] - block[i+8*2]); const int z1 = 13*(block[i+8*0] - block[i+8*2]);
const int z2= 7* block[i+8*1] - 17*block[i+8*3]; const int z2 = 7* block[i+8*1] - 17*block[i+8*3];
const int z3= 17* block[i+8*1] + 7*block[i+8*3]; const int z3 = 17* block[i+8*1] + 7*block[i+8*3];
temp[4*i+0]= z0+z3; temp[4*i+0] = z0 + z3;
temp[4*i+1]= z1+z2; temp[4*i+1] = z1 + z2;
temp[4*i+2]= z1-z2; temp[4*i+2] = z1 - z2;
temp[4*i+3]= z0-z3; temp[4*i+3] = z0 - z3;
} }
} }
...@@ -204,16 +204,16 @@ static void rv34_inv_transform(DCTELEM *block){ ...@@ -204,16 +204,16 @@ static void rv34_inv_transform(DCTELEM *block){
rv34_row_transform(temp, block); rv34_row_transform(temp, block);
for(i=0; i<4; i++){ for(i = 0; i < 4; i++){
const int z0= 13*(temp[4*0+i] + temp[4*2+i]) + 0x200; const int z0 = 13*(temp[4*0+i] + temp[4*2+i]) + 0x200;
const int z1= 13*(temp[4*0+i] - temp[4*2+i]) + 0x200; const int z1 = 13*(temp[4*0+i] - temp[4*2+i]) + 0x200;
const int z2= 7* temp[4*1+i] - 17*temp[4*3+i]; const int z2 = 7* temp[4*1+i] - 17*temp[4*3+i];
const int z3= 17* temp[4*1+i] + 7*temp[4*3+i]; const int z3 = 17* temp[4*1+i] + 7*temp[4*3+i];
block[i*8+0]= (z0 + z3)>>10; block[i*8+0] = (z0 + z3) >> 10;
block[i*8+1]= (z1 + z2)>>10; block[i*8+1] = (z1 + z2) >> 10;
block[i*8+2]= (z1 - z2)>>10; block[i*8+2] = (z1 - z2) >> 10;
block[i*8+3]= (z0 - z3)>>10; block[i*8+3] = (z0 - z3) >> 10;
} }
} }
...@@ -230,16 +230,16 @@ static void rv34_inv_transform_noround(DCTELEM *block){ ...@@ -230,16 +230,16 @@ static void rv34_inv_transform_noround(DCTELEM *block){
rv34_row_transform(temp, block); rv34_row_transform(temp, block);
for(i=0; i<4; i++){ for(i = 0; i < 4; i++){
const int z0= 13*(temp[4*0+i] + temp[4*2+i]); const int z0 = 13*(temp[4*0+i] + temp[4*2+i]);
const int z1= 13*(temp[4*0+i] - temp[4*2+i]); const int z1 = 13*(temp[4*0+i] - temp[4*2+i]);
const int z2= 7* temp[4*1+i] - 17*temp[4*3+i]; const int z2 = 7* temp[4*1+i] - 17*temp[4*3+i];
const int z3= 17* temp[4*1+i] + 7*temp[4*3+i]; const int z3 = 17* temp[4*1+i] + 7*temp[4*3+i];
block[i*8+0]= ((z0 + z3)*3)>>11; block[i*8+0] = ((z0 + z3) * 3) >> 11;
block[i*8+1]= ((z1 + z2)*3)>>11; block[i*8+1] = ((z1 + z2) * 3) >> 11;
block[i*8+2]= ((z1 - z2)*3)>>11; block[i*8+2] = ((z1 - z2) * 3) >> 11;
block[i*8+3]= ((z0 - z3)*3)>>11; block[i*8+3] = ((z0 - z3) * 3) >> 11;
} }
} }
...@@ -772,7 +772,7 @@ static inline void rv34_mc(RV34DecContext *r, const int block_type, ...@@ -772,7 +772,7 @@ static inline void rv34_mc(RV34DecContext *r, const int block_type,
srcV += uvsrc_y * s->uvlinesize + uvsrc_x; srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
if( (unsigned)(src_x - !!lx*2) > s->h_edge_pos - !!lx*2 - (width <<3) - 4 if( (unsigned)(src_x - !!lx*2) > s->h_edge_pos - !!lx*2 - (width <<3) - 4
|| (unsigned)(src_y - !!ly*2) > s->v_edge_pos - !!ly*2 - (height<<3) - 4){ || (unsigned)(src_y - !!ly*2) > s->v_edge_pos - !!ly*2 - (height<<3) - 4){
uint8_t *uvbuf= s->edge_emu_buffer + 22 * s->linesize; uint8_t *uvbuf = s->edge_emu_buffer + 22 * s->linesize;
srcY -= 2 + 2*s->linesize; srcY -= 2 + 2*s->linesize;
s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, (width<<3)+6, (height<<3)+6, s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, (width<<3)+6, (height<<3)+6,
...@@ -1301,8 +1301,8 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int ...@@ -1301,8 +1301,8 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int
} }
memset(r->intra_types_hist, -1, r->intra_types_stride * 4 * 2 * sizeof(*r->intra_types_hist)); memset(r->intra_types_hist, -1, r->intra_types_stride * 4 * 2 * sizeof(*r->intra_types_hist));
s->first_slice_line = 1; s->first_slice_line = 1;
s->resync_mb_x= s->mb_x; s->resync_mb_x = s->mb_x;
s->resync_mb_y= s->mb_y; s->resync_mb_y = s->mb_y;
ff_init_block_index(s); ff_init_block_index(s);
while(!check_slice_end(r, s)) { while(!check_slice_end(r, s)) {
...@@ -1344,11 +1344,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ...@@ -1344,11 +1344,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
MpegEncContext *s = &r->s; MpegEncContext *s = &r->s;
MPV_decode_defaults(s); MPV_decode_defaults(s);
s->avctx= avctx; s->avctx = avctx;
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->codec_id= avctx->codec_id; s->codec_id = avctx->codec_id;
s->width = avctx->width; s->width = avctx->width;
s->height = avctx->height; s->height = avctx->height;
r->s.avctx = avctx; r->s.avctx = avctx;
...@@ -1404,8 +1404,8 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, ...@@ -1404,8 +1404,8 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
if (buf_size == 0) { if (buf_size == 0) {
/* special case for last picture */ /* special case for last picture */
if (s->low_delay==0 && s->next_picture_ptr) { if (s->low_delay==0 && s->next_picture_ptr) {
*pict= *(AVFrame*)s->next_picture_ptr; *pict = *(AVFrame*)s->next_picture_ptr;
s->next_picture_ptr= NULL; s->next_picture_ptr = NULL;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
} }
...@@ -1436,13 +1436,13 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, ...@@ -1436,13 +1436,13 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
|| avctx->skip_frame >= AVDISCARD_ALL) || avctx->skip_frame >= AVDISCARD_ALL)
return buf_size; return buf_size;
for(i=0; i<slice_count; i++){ for(i = 0; i < slice_count; i++){
int offset= get_slice_offset(avctx, slices_hdr, i); int offset = get_slice_offset(avctx, slices_hdr, i);
int size; int size;
if(i+1 == slice_count) if(i+1 == slice_count)
size= buf_size - offset; size = buf_size - offset;
else else
size= get_slice_offset(avctx, slices_hdr, i+1) - offset; size = get_slice_offset(avctx, slices_hdr, i+1) - offset;
if(offset > buf_size){ if(offset > buf_size){
av_log(avctx, AV_LOG_ERROR, "Slice offset is greater than frame size\n"); av_log(avctx, AV_LOG_ERROR, "Slice offset is greater than frame size\n");
...@@ -1472,16 +1472,16 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, ...@@ -1472,16 +1472,16 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
ff_er_frame_end(s); ff_er_frame_end(s);
MPV_frame_end(s); 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) {
*pict= *(AVFrame*)s->current_picture_ptr; *pict = *(AVFrame*)s->current_picture_ptr;
} else if (s->last_picture_ptr != NULL) { } else if (s->last_picture_ptr != NULL) {
*pict= *(AVFrame*)s->last_picture_ptr; *pict = *(AVFrame*)s->last_picture_ptr;
} }
if(s->last_picture_ptr || s->low_delay){ if(s->last_picture_ptr || s->low_delay){
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
ff_print_debug_info(s, pict); ff_print_debug_info(s, pict);
} }
s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...) s->current_picture_ptr = NULL; //so we can detect if frame_end wasnt called (find some nicer solution...)
} }
return buf_size; return buf_size;
} }
......
libavcodec/rv40.c
View file @ 3a1df52e
...@@ -677,7 +677,7 @@ AVCodec ff_rv40_decoder = { ...@@ -677,7 +677,7 @@ AVCodec ff_rv40_decoder = {
.close = ff_rv34_decode_end, .close = ff_rv34_decode_end,
.decode = ff_rv34_decode_frame, .decode = ff_rv34_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
.pix_fmts= ff_pixfmt_list_420, .pix_fmts = ff_pixfmt_list_420,
}; };
libavcodec/rv40dsp.c
View file @ 3a1df52e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment