Skip to content

F
ffmpeg.wasm-core
Commit b09c93d7 authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files
Options

Move some duplicated code, simplify. 

Signed-off-by: 's avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
parent 0a403588
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 28 deletions
libavcodec/fraps.c
View file @ b09c93d7
...@@ -157,6 +157,13 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -157,6 +157,13 @@ static int decode_frame(AVCodecContext *avctx,
if (header_size == 8) if (header_size == 8)
buf+=4; buf+=4;
f->pict_type = AV_PICTURE_TYPE_I;
f->key_frame = 1;
f->reference = 3;
f->buffer_hints = FF_BUFFER_HINTS_VALID |
FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE;
switch(version) { switch(version) {
case 0: case 0:
default: default:
...@@ -177,19 +184,15 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -177,19 +184,15 @@ static int decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
f->reference = 3;
f->buffer_hints = FF_BUFFER_HINTS_VALID |
FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, f)) { if (avctx->reget_buffer(avctx, f)) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return -1;
} }
/* bit 31 means same as previous pic */ /* bit 31 means same as previous pic */
f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; if (header & (1U<<31)) {
f->key_frame = f->pict_type == AV_PICTURE_TYPE_I; f->pict_type = AV_PICTURE_TYPE_P;
f->key_frame = 0;
if (f->pict_type == AV_PICTURE_TYPE_I) { } else {
buf32=(const uint32_t*)buf; buf32=(const uint32_t*)buf;
for(y=0; y<avctx->height/2; y++){ for(y=0; y<avctx->height/2; y++){
luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ]; luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ];
...@@ -220,19 +223,15 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -220,19 +223,15 @@ static int decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
f->reference = 3;
f->buffer_hints = FF_BUFFER_HINTS_VALID |
FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, f)) { if (avctx->reget_buffer(avctx, f)) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return -1;
} }
/* bit 31 means same as previous pic */ /* bit 31 means same as previous pic */
f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; if (header & (1U<<31)) {
f->key_frame = f->pict_type == AV_PICTURE_TYPE_I; f->pict_type = AV_PICTURE_TYPE_P;
f->key_frame = 0;
if (f->pict_type == AV_PICTURE_TYPE_I) { } else {
for(y=0; y<avctx->height; y++) for(y=0; y<avctx->height; y++)
memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ], memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ],
&buf[y*avctx->width*3], &buf[y*avctx->width*3],
...@@ -247,10 +246,6 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -247,10 +246,6 @@ static int decode_frame(AVCodecContext *avctx,
* Fraps v4 is virtually the same * Fraps v4 is virtually the same
*/ */
avctx->pix_fmt = PIX_FMT_YUVJ420P; avctx->pix_fmt = PIX_FMT_YUVJ420P;
f->reference = 3;
f->buffer_hints = FF_BUFFER_HINTS_VALID |
FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, f)) { if (avctx->reget_buffer(avctx, f)) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return -1;
...@@ -261,8 +256,6 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -261,8 +256,6 @@ static int decode_frame(AVCodecContext *avctx,
f->key_frame = 0; f->key_frame = 0;
break; break;
} }
f->pict_type = AV_PICTURE_TYPE_I;
f->key_frame = 1;
if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) { if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) {
av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n");
return -1; return -1;
...@@ -291,10 +284,6 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -291,10 +284,6 @@ static int decode_frame(AVCodecContext *avctx,
case 5: case 5:
/* Virtually the same as version 4, but is for RGB24 */ /* Virtually the same as version 4, but is for RGB24 */
avctx->pix_fmt = PIX_FMT_BGR24; avctx->pix_fmt = PIX_FMT_BGR24;
f->reference = 3;
f->buffer_hints = FF_BUFFER_HINTS_VALID |
FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, f)) { if (avctx->reget_buffer(avctx, f)) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return -1;
...@@ -305,8 +294,6 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -305,8 +294,6 @@ static int decode_frame(AVCodecContext *avctx,
f->key_frame = 0; f->key_frame = 0;
break; break;
} }
f->pict_type = AV_PICTURE_TYPE_I;
f->key_frame = 1;
if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) { if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) {
av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n");
return -1; return -1;
......
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