avcodec/snow: Split ff_snow_get_buffer()

The part of said function that is common to both encoder and decoder is negligible since c954cf1e1b766a0d1992d5be0a8be0055a8e1a6a and more than offset by the costs of "Am I an encoder?" checks. So move allocating the frames to the encoder and decoder directly. Also rename ff_snow_frame_start() to ff_snow_frames_prepare(), because a frame without a buffer has not been properly started.

Andreas Rheinhardt committed 3 years ago

Commit 418332e1 parent 0228e274 files · +41 −46Browse files

Unified · Split

4 files

libavcodec/snow.c +5 −41
libavcodec/snow.h +1 −2
libavcodec/snowdec.c +8 −1
libavcodec/snowenc.c +27 −2

libavcodec/snow.c+5−41

 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "decode.h"
-#include "encode.h"
 #include "snow_dwt.h"
 #include "snow.h"
 #include "snowdata.h"
     }
 }
-int ff_snow_get_buffer(SnowContext *s, AVFrame *frame)
-{
-    int ret, i;
-    int edges_needed = av_codec_is_encoder(s->avctx->codec);
-    frame->width  = s->avctx->width ;
-    frame->height = s->avctx->height;
-    if (edges_needed) {
-        frame->width  += 2 * EDGE_WIDTH;
-        frame->height += 2 * EDGE_WIDTH;
-        ret = ff_encode_alloc_frame(s->avctx, frame);
-    } else
-        ret = ff_get_buffer(s->avctx, frame, AV_GET_BUFFER_FLAG_REF);
-    if (ret < 0)
-        return ret;
-    if (edges_needed) {
-        for (i = 0; frame->data[i]; i++) {
-            int offset = (EDGE_WIDTH >> (i ? s->chroma_v_shift : 0)) *
-                            frame->linesize[i] +
-                            (EDGE_WIDTH >> (i ? s->chroma_h_shift : 0));
-            frame->data[i] += offset;
-        }
-        frame->width  = s->avctx->width;
-        frame->height = s->avctx->height;
-    }
-    return 0;
-}
 void ff_snow_reset_contexts(SnowContext *s){ //FIXME better initial contexts
     int plane_index, level, orientation;
     }
 }
-int ff_snow_frame_start(SnowContext *s){
+int ff_snow_frames_prepare(SnowContext *s)
+{
    AVFrame *tmp;
-   int i, ret;
     ff_snow_release_buffer(s->avctx);
     tmp= s->last_picture[s->max_ref_frames-1];
-    for(i=s->max_ref_frames-1; i>0; i--)
+    for (int i = s->max_ref_frames - 1; i > 0; i--)
         s->last_picture[i] = s->last_picture[i-1];
     s->last_picture[0] = s->current_picture;
     s->current_picture = tmp;
     if(s->keyframe){
         s->ref_frames= 0;
+        s->current_picture->flags |= AV_FRAME_FLAG_KEY;
     }else{
         int i;
         for(i=0; i<s->max_ref_frames && s->last_picture[i]->data[0]; i++)
             av_log(s->avctx,AV_LOG_ERROR, "No reference frames\n");
             return AVERROR_INVALIDDATA;
         }
-    }
-    if ((ret = ff_snow_get_buffer(s, s->current_picture)) < 0)
-        return ret;
-    if (s->keyframe)
-        s->current_picture->flags |= AV_FRAME_FLAG_KEY;
-    else
         s->current_picture->flags &= ~AV_FRAME_FLAG_KEY;
+    }
     return 0;
 }

libavcodec/snow.h+1−2

 void ff_snow_release_buffer(AVCodecContext *avctx);
 void ff_snow_reset_contexts(SnowContext *s);
 int ff_snow_alloc_blocks(SnowContext *s);
-int ff_snow_frame_start(SnowContext *s);
+int ff_snow_frames_prepare(SnowContext *s);
 void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, ptrdiff_t stride,
                      int sx, int sy, int b_w, int b_h, const BlockNode *block,
                      int plane_index, int w, int h);
-int ff_snow_get_buffer(SnowContext *s, AVFrame *frame);
 /* common inline functions */
 //XXX doublecheck all of them should stay inlined

libavcodec/snowdec.c+8−1

 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "snow_dwt.h"
 #include "snow.h"
     ff_snow_alloc_blocks(s);
-    if((res = ff_snow_frame_start(s)) < 0)
+    if ((res = ff_snow_frames_prepare(s)) < 0)
+        return res;
+    s->current_picture->width  = s->avctx->width;
+    s->current_picture->height = s->avctx->height;
+    res = ff_get_buffer(s->avctx, s->current_picture, AV_GET_BUFFER_FLAG_REF);
+    if (res < 0)
         return res;
     s->current_picture->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;

libavcodec/snowenc.c+27−2

@@ -39,6 +39,28 @@ · 38 unmodified lines
39	#include "mpegvideo.h"	39	#include "mpegvideo.h"
40	#include "h263enc.h"	40	#include "h263enc.h"
41		41
		42	static int get_encode_buffer(SnowContext s, AVFrame frame)
		43	{
		44	int ret;
		45
		46	frame->width = s->avctx->width + 2 * EDGE_WIDTH;
		47	frame->height = s->avctx->height + 2 * EDGE_WIDTH;
		48
		49	ret = ff_encode_alloc_frame(s->avctx, frame);
		50	if (ret < 0)
		51	return ret;
		52	for (int i = 0; frame->data[i]; i++) {
		53	int offset = (EDGE_WIDTH >> (i ? s->chroma_v_shift : 0)) *
		54	frame->linesize[i] +
		55	(EDGE_WIDTH >> (i ? s->chroma_h_shift : 0));
		56	frame->data[i] += offset;
		57	}
		58	frame->width = s->avctx->width;
		59	frame->height = s->avctx->height;
		60
		61	return 0;
		62	}
		63
42	static av_cold int encode_init(AVCodecContext *avctx)	64	static av_cold int encode_init(AVCodecContext *avctx)
43	{	65	{
44	SnowContext *s = avctx->priv_data;	66	SnowContext *s = avctx->priv_data;
@@ -140,7 +162,7 @@ static av_cold int encode_init(AVCodecContext *avctx) · 95 unmodified lines
140	if (!s->input_picture)	162	if (!s->input_picture)
141	return AVERROR(ENOMEM);	163	return AVERROR(ENOMEM);
142		164
143	if ((ret = ff_snow_get_buffer(s, s->input_picture)) < 0)	165	if ((ret = get_encode_buffer(s, s->input_picture)) < 0)
144	return ret;	166	return ret;
145		167
146	if(s->motion_est == FF_ME_ITER){	168	if(s->motion_est == FF_ME_ITER){
@@ -1659,7 +1681,10 @@ static int encode_frame(AVCodecContext avctx, AVPacket pkt, · 1512 unmodified lines
1659	emms_c();	1681	emms_c();
1660	}	1682	}
1661		1683
1662	ff_snow_frame_start(s);	1684	ff_snow_frames_prepare(s);
		1685	ret = get_encode_buffer(s, s->current_picture);
		1686	if (ret < 0)
		1687	return ret;
1663		1688
1664	s->m.current_picture_ptr= &s->m.current_picture;	1689	s->m.current_picture_ptr= &s->m.current_picture;
1665	s->m.current_picture.f = s->current_picture;	1690	s->m.current_picture.f = s->current_picture;

avcodec/snow: Split ff_snow_get_buffer()

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code