[FFmpeg-devel] [PATCH 08/11] fftools/ffmpeg_enc: split off parts of enc_open() into a separate function

[James Almer]

Preparation work for the following commits.

Signed-off-by: James Almer <jamr...@gmail.com>
---
 fftools/ffmpeg_enc.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index a46af4dce1..8e68831ee8 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -181,7 +181,7 @@ static int hw_device_setup_for_encode(Encoder *e, 
AVCodecContext *enc_ctx,
     return 0;
 }
 
-int enc_open(void *opaque, const AVFrame *frame)
+static int enc_reopen(void *opaque, const AVFrame *frame)
 {
     OutputStream *ost = opaque;
     InputStream *ist = ost->ist;
@@ -190,14 +190,9 @@ int enc_open(void *opaque, const AVFrame *frame)
     AVCodecContext *enc_ctx = e->enc_ctx;
     Decoder            *dec = NULL;
     const AVCodec      *enc = enc_ctx->codec;
-    OutputFile          *of = ost->file;
     FrameData *fd;
-    int frame_samples = 0;
     int ret;
 
-    if (ep->opened)
-        return 0;
-
     // frame is always non-NULL for audio and video
     av_assert0(frame || (enc->type != AVMEDIA_TYPE_VIDEO && enc->type != 
AVMEDIA_TYPE_AUDIO));
 
@@ -343,14 +338,34 @@ int enc_open(void *opaque, const AVFrame *frame)
 
     ep->opened = 1;
 
-    if (enc_ctx->frame_size)
-        frame_samples = enc_ctx->frame_size;
-
     if (enc_ctx->bit_rate && enc_ctx->bit_rate < 1000 &&
         enc_ctx->codec_id != AV_CODEC_ID_CODEC2 /* don't complain about 700 
bit/s modes */)
         av_log(e, AV_LOG_WARNING, "The bitrate parameter is set too low."
                                     " It takes bits/s as argument, not 
kbits/s\n");
 
+    return 0;
+}
+
+int enc_open(void *opaque, const AVFrame *frame)
+{
+    OutputStream *ost = opaque;
+    Encoder              *e = ost->enc;
+    EncoderPriv         *ep = ep_from_enc(e);
+    AVCodecContext *enc_ctx = e->enc_ctx;
+    OutputFile          *of = ost->file;
+    int frame_samples = 0;
+    int ret;
+
+    if (ep->opened)
+        return 0;
+
+    ret = enc_reopen(opaque, frame);
+    if (ret < 0)
+        return ret;
+
+    if (enc_ctx->frame_size)
+        frame_samples = enc_ctx->frame_size;
+
     ret = of_stream_init(of, ost, enc_ctx);
     if (ret < 0)
         return ret;
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".