[FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove FF_CODEC_CAP_SETS_PKT_DTS cap

[FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove FF_CODEC_CAP_SETS_PKT_DTS cap

[Andreas Rheinhardt]

This decoder implements the receive_frame API; such decoders
always have to set the pkt_dts field themselves and the avcodec
test checks for this.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index 58ef90d929..eb007e30fe 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -534,5 +534,5 @@ const FFCodec ff_libxevd_decoder = {
     .p.capabilities     = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
     .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
     .p.wrapper_name     = "libxevd",
-    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_SETS_FRAME_PROPS
+    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_FRAME_PROPS
 };
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/9] avcodec/libxevd: Set AV_CODEC_CAP_DR1

[Andreas Rheinhardt]

This decoder uses av_image_copy() to copy decoded images
to buffers obtained via ff_get_buffer(); ergo it can handle
user-provided buffers.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index eb007e30fe..4bcf2585cc 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -531,7 +531,8 @@ const FFCodec ff_libxevd_decoder = {
     .close              = libxevd_close,
     .priv_data_size     = sizeof(XevdContext),
     .p.priv_class       = &libxevd_class,
-    .p.capabilities     = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
+    .p.capabilities     = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
+                          AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
     .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
     .p.wrapper_name     = "libxevd",
     .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_FRAME_PROPS
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/9] avcodec/libxevd: Avoid cloning AVPacket

[Andreas Rheinhardt]

Cloning a packet whose source is going to be unreferenced
immediately afterwards is wasteful.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index 4bcf2585cc..0553ebfb06 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -286,17 +286,14 @@ static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame)
         XEVD_STAT stat;
         XEVD_BITB bitb;
         int nalu_size;
-        AVPacket* pkt_au;
+        AVPacket *pkt_au = av_packet_alloc();
         imgb = NULL;
 
-        pkt_au = av_packet_clone(pkt);
         if (!pkt_au) {
-            av_log(avctx, AV_LOG_ERROR, "Cannot clone AVPacket\n");
             av_packet_unref(pkt);
             return AVERROR(ENOMEM);
         }
-
-        av_packet_unref(pkt);
+        FFSWAP(AVPacket*, pkt_au, xectx->pkt);
 
         // get all nal units from AU
         while(pkt_au->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) {
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/9] avcodec/libxevd: Deduplicate code

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
The ownership semantics of the pkt_au packet seem crazy;
I have no clue when ownership has actually passed to libxevd
(or rather: when one can expect to get an image with this packet
attached returned from the decoder).
Furthermore, given that libxevd sees this just as an opaque pointer
(without free callback), we will leak AVPackets still stuck
in libxevd if a user closes this decoder with the decoder not
flushed.
I don't know how libxevd behaves on errors; if it discard a frame
in case of error, the associated packet will leak.
Trying to compile doesn't work unless one overrides dangling-pointer
warnings (which are treated as errors by the build system), so I don't
expect anything good from them.

 libavcodec/libxevd.c | 160 +++++++++++++++++--------------------------
 1 file changed, 61 insertions(+), 99 deletions(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index 0553ebfb06..33fd18f74d 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -252,6 +252,65 @@ static av_cold int libxevd_init(AVCodecContext *avctx)
     return 0;
 }
 
+static int libxevd_return_frame(AVCodecContext *avctx, AVFrame *frame,
+                                XEVD_IMGB *imgb, AVPacket **pkt_au)
+{
+    int ret;
+
+                        AVPacket* pkt_au_imgb = (AVPacket*)imgb->pdata[0];
+                        if(!pkt_au_imgb) {
+                            av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n");
+
+                            if (pkt_au)
+                                av_packet_free(pkt_au);
+                            av_frame_unref(frame);
+
+                            imgb->release(imgb);
+                            imgb = NULL;
+
+                            return AVERROR_INVALIDDATA;
+                        }
+
+                        // got frame
+                        ret = libxevd_image_copy(avctx, imgb, frame);
+                        if(ret < 0) {
+                            av_log(avctx, AV_LOG_ERROR, "Image copying error\n");
+
+                            av_packet_free(&pkt_au_imgb);
+                            av_frame_unref(frame);
+
+                            imgb->release(imgb);
+                            imgb = NULL;
+
+                            return ret;
+                        }
+
+                        // use ff_decode_frame_props_from_pkt() to fill frame properties
+                        ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb);
+                        if (ret < 0) {
+                            av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n");
+
+                            av_packet_free(&pkt_au_imgb);
+                            av_frame_unref(frame);
+
+                            imgb->release(imgb);
+                            imgb = NULL;
+
+                            return ret;
+                        }
+
+                        frame->pkt_dts = imgb->ts[XEVD_TS_DTS];
+                        frame->pts = imgb->ts[XEVD_TS_PTS];
+
+                        av_packet_free(&pkt_au_imgb);
+
+                        // xevd_pull uses pool of objects of type XEVD_IMGB.
+                        // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed
+                        imgb->release(imgb);
+                        imgb = NULL;
+
+    return 0;
+}
 /**
   * Decode frame with decoupled packet/frame dataflow
   *
@@ -361,56 +420,7 @@ static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame)
                             return  AVERROR(EAGAIN);
                         }
                     } else {
-                        // got frame
-                        AVPacket* pkt_au_imgb = (AVPacket*)imgb->pdata[0];
-                        if(!pkt_au_imgb) {
-                            av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n");
-
-                            av_packet_free(&pkt_au);
-                            av_frame_unref(frame);
-
-                            imgb->release(imgb);
-                            imgb = NULL;
-
-                            return AVERROR_INVALIDDATA;
-                        }
-
-                        ret = libxevd_image_copy(avctx, imgb, frame);
-                        if(ret < 0) {
-                            av_log(avctx, AV_LOG_ERROR, "Image copying error\n");
-
-                            av_packet_free(&pkt_au_imgb);
-                            av_frame_unref(frame);
-
-                            imgb->release(imgb);
-                            imgb = NULL;
-
-                            return ret;
-                        }
-
-                        // use ff_decode_frame_props_from_pkt() to fill frame properties
-                        ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb);
-                        if (ret < 0) {
-                            av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n");
-
-                            av_packet_free(&pkt_au_imgb);
-                            av_frame_unref(frame);
-
-                            imgb->release(imgb);
-                            imgb = NULL;
-
-                            return ret;
-                        }
-
-                        frame->pkt_dts = imgb->ts[XEVD_TS_DTS];
-                        frame->pts = imgb->ts[XEVD_TS_PTS];
-
-                        av_packet_free(&pkt_au_imgb);
-
-                        // xevd_pull uses pool of objects of type XEVD_IMGB.
-                        // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed
-                        imgb->release(imgb);
-                        imgb = NULL;
+                        return libxevd_return_frame(avctx, frame, imgb, &pkt_au);
                     }
                 }
             }
@@ -428,61 +438,13 @@ static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame)
 
             return AVERROR_EXTERNAL;
         } else { // XEVD_OK
-            AVPacket* pkt_au_imgb;
             if (!imgb) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid decoded image data\n");
 
                 return AVERROR_EXTERNAL;
             }
 
-            pkt_au_imgb = (AVPacket*)imgb->pdata[0];
-            if(!pkt_au_imgb) {
-                av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n");
-
-                imgb->release(imgb);
-                imgb = NULL;
-
-                av_frame_unref(frame);
-
-                return AVERROR_INVALIDDATA;
-            }
-
-            // got frame
-            ret = libxevd_image_copy(avctx, imgb, frame);
-            if(ret < 0) {
-                av_packet_free(&pkt_au_imgb);
-                av_frame_unref(frame);
-
-                imgb->release(imgb);
-                imgb = NULL;
-
-                return ret;
-            }
-            // use ff_decode_frame_props_from_pkt() to fill frame properties
-            ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb);
-            if (ret < 0) {
-                av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n");
-
-                av_packet_free(&pkt_au_imgb);
-                av_frame_unref(frame);
-
-                imgb->release(imgb);
-                imgb = NULL;
-
-                return ret;
-            }
-
-            frame->pkt_dts = imgb->ts[XEVD_TS_DTS];
-            frame->pts = imgb->ts[XEVD_TS_PTS];
-
-            av_packet_free(&pkt_au_imgb);
-
-            // xevd_pull uses pool of objects of type XEVD_IMGB.
-            // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed
-            imgb->release(imgb);
-            imgb = NULL;
-
-            return 0;
+            return libxevd_return_frame(avctx, frame, imgb, NULL);
         }
     }
 
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 5/9] avcodec/libxevd: Reindent after the previous commit

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 74 ++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index 33fd18f74d..de0739a80c 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -255,59 +255,59 @@ static av_cold int libxevd_init(AVCodecContext *avctx)
 static int libxevd_return_frame(AVCodecContext *avctx, AVFrame *frame,
                                 XEVD_IMGB *imgb, AVPacket **pkt_au)
 {
+    AVPacket *pkt_au_imgb = (AVPacket*)imgb->pdata[0];
     int ret;
 
-                        AVPacket* pkt_au_imgb = (AVPacket*)imgb->pdata[0];
-                        if(!pkt_au_imgb) {
-                            av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n");
+    if (!pkt_au_imgb) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n");
 
-                            if (pkt_au)
-                                av_packet_free(pkt_au);
-                            av_frame_unref(frame);
+        if (pkt_au)
+            av_packet_free(pkt_au);
+        av_frame_unref(frame);
 
-                            imgb->release(imgb);
-                            imgb = NULL;
+        imgb->release(imgb);
+        imgb = NULL;
 
-                            return AVERROR_INVALIDDATA;
-                        }
+        return AVERROR_INVALIDDATA;
+    }
 
-                        // got frame
-                        ret = libxevd_image_copy(avctx, imgb, frame);
-                        if(ret < 0) {
-                            av_log(avctx, AV_LOG_ERROR, "Image copying error\n");
+    // got frame
+    ret = libxevd_image_copy(avctx, imgb, frame);
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Image copying error\n");
 
-                            av_packet_free(&pkt_au_imgb);
-                            av_frame_unref(frame);
+        av_packet_free(&pkt_au_imgb);
+        av_frame_unref(frame);
 
-                            imgb->release(imgb);
-                            imgb = NULL;
+        imgb->release(imgb);
+        imgb = NULL;
 
-                            return ret;
-                        }
+        return ret;
+    }
 
-                        // use ff_decode_frame_props_from_pkt() to fill frame properties
-                        ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb);
-                        if (ret < 0) {
-                            av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n");
+    // use ff_decode_frame_props_from_pkt() to fill frame properties
+    ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb);
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n");
 
-                            av_packet_free(&pkt_au_imgb);
-                            av_frame_unref(frame);
+        av_packet_free(&pkt_au_imgb);
+        av_frame_unref(frame);
 
-                            imgb->release(imgb);
-                            imgb = NULL;
+        imgb->release(imgb);
+        imgb = NULL;
 
-                            return ret;
-                        }
+        return ret;
+    }
 
-                        frame->pkt_dts = imgb->ts[XEVD_TS_DTS];
-                        frame->pts = imgb->ts[XEVD_TS_PTS];
+    frame->pkt_dts = imgb->ts[XEVD_TS_DTS];
+    frame->pts = imgb->ts[XEVD_TS_PTS];
 
-                        av_packet_free(&pkt_au_imgb);
+    av_packet_free(&pkt_au_imgb);
 
-                        // xevd_pull uses pool of objects of type XEVD_IMGB.
-                        // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed
-                        imgb->release(imgb);
-                        imgb = NULL;
+    // xevd_pull uses pool of objects of type XEVD_IMGB.
+    // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed
+    imgb->release(imgb);
+    imgb = NULL;
 
     return 0;
 }
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 6/9] avcodec/libxevd: Remove useless AVClass

[Andreas Rheinhardt]

This decoder does not have options.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index de0739a80c..5075936a0e 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -50,8 +50,6 @@
  * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC decoder
  */
 typedef struct XevdContext {
-    const AVClass *class;
-
     XEVD id;            // XEVD instance identifier @see xevd.h
     XEVD_CDSC cdsc;     // decoding parameters @see xevd.h
 
@@ -471,15 +469,6 @@ static av_cold int libxevd_close(AVCodecContext *avctx)
     return 0;
 }
 
-#define OFFSET(x) offsetof(XevdContext, x)
-#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
-
-static const AVClass libxevd_class = {
-    .class_name = "libxevd",
-    .item_name  = av_default_item_name,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
 const FFCodec ff_libxevd_decoder = {
     .p.name             = "evc",
     .p.long_name        = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"),
@@ -489,7 +478,6 @@ const FFCodec ff_libxevd_decoder = {
     FF_CODEC_RECEIVE_FRAME_CB(libxevd_receive_frame),
     .close              = libxevd_close,
     .priv_data_size     = sizeof(XevdContext),
-    .p.priv_class       = &libxevd_class,
     .p.capabilities     = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
                           AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
     .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 7/9] avcodec/libxevd: Use CODEC_LONG_NAME()

[Andreas Rheinhardt]

Brings the length of the line down to less than 80 chars.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index 5075936a0e..92804422a3 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -471,7 +471,7 @@ static av_cold int libxevd_close(AVCodecContext *avctx)
 
 const FFCodec ff_libxevd_decoder = {
     .p.name             = "evc",
-    .p.long_name        = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"),
+    CODEC_LONG_NAME("EVC / MPEG-5 Essential Video Coding (EVC)"),
     .p.type             = AVMEDIA_TYPE_VIDEO,
     .p.id               = AV_CODEC_ID_EVC,
     .init               = libxevd_init,
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 8/9] avcodec/libxevd: Improve included headers a bit

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index 92804422a3..f78606291c 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -21,22 +21,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <float.h>
-#include <stdlib.h>
+#include <stddef.h>
 
 #include <xevd.h>
 
 #include "libavutil/internal.h"
 #include "libavutil/common.h"
-#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/cpu.h"
 
 #include "avcodec.h"
-#include "internal.h"
-#include "packet_internal.h"
 #include "codec_internal.h"
 #include "profiles.h"
 #include "decode.h"
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 9/9] avcodec/libxevd: Fix "if (ret = ff_foo() < 0)" precedence problem

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libxevd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index f78606291c..f15c2583a1 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -204,7 +204,8 @@ static int libxevd_image_copy(struct AVCodecContext *avctx, XEVD_IMGB *imgb, str
         }
     }
 
-    if (ret = ff_get_buffer(avctx, frame, 0) < 0)
+    ret = ff_get_buffer(avctx, frame, 0);
+    if (ret < 0)
         return ret;
 
     av_image_copy(frame->data, frame->linesize, (const uint8_t **)imgb->a,
-- 
2.40.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-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove FF_CODEC_CAP_SETS_PKT_DTS cap

[Andreas Rheinhardt]

Andreas Rheinhardt:
> This decoder implements the receive_frame API; such decoders
> always have to set the pkt_dts field themselves and the avcodec
> test checks for this.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/libxevd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
> index 58ef90d929..eb007e30fe 100644
> --- a/libavcodec/libxevd.c
> +++ b/libavcodec/libxevd.c
> @@ -534,5 +534,5 @@ const FFCodec ff_libxevd_decoder = {
>      .p.capabilities     = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
>      .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
>      .p.wrapper_name     = "libxevd",
> -    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_SETS_FRAME_PROPS
> +    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_FRAME_PROPS
>  };

Will apply this patchset tomorrow unless there are objections.

- Andreas

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

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

Re: [FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove FF_CODEC_CAP_SETS_PKT_DTS cap

[Dawid Kozinski/Multimedia (PLT) /SRPOL/Staff Engineer/Samsung Electronics]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Andreas Rheinhardt
> Sent: wtorek, 27 lutego 2024 20:48
> To: ffmpeg-devel@ffmpeg.org
> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Subject: [FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove
> FF_CODEC_CAP_SETS_PKT_DTS cap
> 
> This decoder implements the receive_frame API; such decoders always have
to
> set the pkt_dts field themselves and the avcodec test checks for this.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/libxevd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index
> 58ef90d929..eb007e30fe 100644
> --- a/libavcodec/libxevd.c
> +++ b/libavcodec/libxevd.c
> @@ -534,5 +534,5 @@ const FFCodec ff_libxevd_decoder = {
>      .p.capabilities     = AV_CODEC_CAP_DELAY |
> AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
>      .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
>      .p.wrapper_name     = "libxevd",
> -    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP |
> FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS |
> FF_CODEC_CAP_SETS_FRAME_PROPS
> +    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP |
> FF_CODEC_CAP_NOT_INIT_THREADSAFE |
> FF_CODEC_CAP_SETS_FRAME_PROPS
>  };
> --
> 2.40.1
> 
It has been checked. Looks good.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://protect2.fireeye.com/v1/url?k=90421711-f13fff56-90439c5e-
> 74fe485fff30-8ac153898cae4df3&q=1&e=8fc861d3-bd49-4b68-a822-
> 7514fe931b97&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp
> eg-devel
> 
> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org
> with subject "unsubscribe".

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

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

Re: [FFmpeg-devel] [PATCH 2/9] avcodec/libxevd: Set AV_CODEC_CAP_DR1

[Dawid Kozinski/Multimedia (PLT) /SRPOL/Staff Engineer/Samsung Electronics]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Andreas Rheinhardt
> Sent: wtorek, 27 lutego 2024 20:59
> To: ffmpeg-devel@ffmpeg.org
> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/libxevd: Set AV_CODEC_CAP_DR1
> 
> This decoder uses av_image_copy() to copy decoded images to buffers
obtained
> via ff_get_buffer(); ergo it can handle user-provided buffers.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/libxevd.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index
> eb007e30fe..4bcf2585cc 100644
> --- a/libavcodec/libxevd.c
> +++ b/libavcodec/libxevd.c
> @@ -531,7 +531,8 @@ const FFCodec ff_libxevd_decoder = {
>      .close              = libxevd_close,
>      .priv_data_size     = sizeof(XevdContext),
>      .p.priv_class       = &libxevd_class,
> -    .p.capabilities     = AV_CODEC_CAP_DELAY |
> AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
> +    .p.capabilities     = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
> +                          AV_CODEC_CAP_OTHER_THREADS |
> + AV_CODEC_CAP_AVOID_PROBING,
>      .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
>      .p.wrapper_name     = "libxevd",
>      .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP |
> FF_CODEC_CAP_NOT_INIT_THREADSAFE |
> FF_CODEC_CAP_SETS_FRAME_PROPS
> --
> 2.40.1
> 
It has been checked. Looks good.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://protect2.fireeye.com/v1/url?k=1bd9a923-4442903c-1bd8226c-
> 000babdfecba-775f8081ce267ea1&q=1&e=6c5480c4-5786-4329-8ea5-
> 7b0e913bf303&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp
> eg-devel
> 
> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org
> with subject "unsubscribe".

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

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

Re: [FFmpeg-devel] [PATCH 6/9] avcodec/libxevd: Remove useless AVClass

[Dawid Kozinski/Multimedia (PLT) /SRPOL/Staff Engineer/Samsung Electronics]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Andreas Rheinhardt
> Sent: wtorek, 27 lutego 2024 20:59
> To: ffmpeg-devel@ffmpeg.org
> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/libxevd: Remove useless
AVClass
> 
> This decoder does not have options.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/libxevd.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index
> de0739a80c..5075936a0e 100644
> --- a/libavcodec/libxevd.c
> +++ b/libavcodec/libxevd.c
> @@ -50,8 +50,6 @@
>   * The structure stores all the states associated with the instance of
Xeve MPEG-
> 5 EVC decoder
>   */
>  typedef struct XevdContext {
> -    const AVClass *class;
> -
>      XEVD id;            // XEVD instance identifier @see xevd.h
>      XEVD_CDSC cdsc;     // decoding parameters @see xevd.h
> 
> @@ -471,15 +469,6 @@ static av_cold int libxevd_close(AVCodecContext
> *avctx)
>      return 0;
>  }
> 
> -#define OFFSET(x) offsetof(XevdContext, x) -#define VD
> AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
> -
> -static const AVClass libxevd_class = {
> -    .class_name = "libxevd",
> -    .item_name  = av_default_item_name,
> -    .version    = LIBAVUTIL_VERSION_INT,
> -};
> -
>  const FFCodec ff_libxevd_decoder = {
>      .p.name             = "evc",
>      .p.long_name        = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential
Video
> Coding (EVC)"),
> @@ -489,7 +478,6 @@ const FFCodec ff_libxevd_decoder = {
>      FF_CODEC_RECEIVE_FRAME_CB(libxevd_receive_frame),
>      .close              = libxevd_close,
>      .priv_data_size     = sizeof(XevdContext),
> -    .p.priv_class       = &libxevd_class,
>      .p.capabilities     = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
>                            AV_CODEC_CAP_OTHER_THREADS |
> AV_CODEC_CAP_AVOID_PROBING,
>      .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
> --
> 2.40.1
> 
It has been checked. Looks good.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://protect2.fireeye.com/v1/url?k=bf2f1a4e-e0b33364-bf2e9101-
> 000babe598f7-5400e6cfb92c61da&q=1&e=f85ba7c0-e001-488d-9c87-
> 565dfbde8ea3&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp
> eg-devel
> 
> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org
> with subject "unsubscribe".

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

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

Re: [FFmpeg-devel] [PATCH 7/9] avcodec/libxevd: Use CODEC_LONG_NAME()

[Dawid Kozinski/Multimedia (PLT) /SRPOL/Staff Engineer/Samsung Electronics]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Andreas Rheinhardt
> Sent: wtorek, 27 lutego 2024 20:59
> To: ffmpeg-devel@ffmpeg.org
> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Subject: [FFmpeg-devel] [PATCH 7/9] avcodec/libxevd: Use
> CODEC_LONG_NAME()
> 
> Brings the length of the line down to less than 80 chars.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/libxevd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index
> 5075936a0e..92804422a3 100644
> --- a/libavcodec/libxevd.c
> +++ b/libavcodec/libxevd.c
> @@ -471,7 +471,7 @@ static av_cold int libxevd_close(AVCodecContext
> *avctx)
> 
>  const FFCodec ff_libxevd_decoder = {
>      .p.name             = "evc",
> -    .p.long_name        = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential
Video
> Coding (EVC)"),
> +    CODEC_LONG_NAME("EVC / MPEG-5 Essential Video Coding (EVC)"),
>      .p.type             = AVMEDIA_TYPE_VIDEO,
>      .p.id               = AV_CODEC_ID_EVC,
>      .init               = libxevd_init,
> --
> 2.40.1
> 
It has been checked. Looks good.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://protect2.fireeye.com/v1/url?k=1d225d22-7ca9480d-1d23d66d-
> 74fe485cbfe7-f66098d66f3bbf3d&q=1&e=74f8822a-e9c0-4ed9-be20-
> f11f599cf138&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmpe
> g-devel
> 
> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org
> with subject "unsubscribe".

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

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

Re: [FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove FF_CODEC_CAP_SETS_PKT_DTS cap

[Dawid Kozinski/Multimedia (PLT) /SRPOL/Staff Engineer/Samsung Electronics]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Andreas Rheinhardt
> Sent: czwartek, 29 lutego 2024 10:37
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH 1/9] avcodec/libxevd: Remove
> FF_CODEC_CAP_SETS_PKT_DTS cap
> 
> Andreas Rheinhardt:
> > This decoder implements the receive_frame API; such decoders always
> > have to set the pkt_dts field themselves and the avcodec test checks
> > for this.
> >
> > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> > ---
> >  libavcodec/libxevd.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index
> > 58ef90d929..eb007e30fe 100644
> > --- a/libavcodec/libxevd.c
> > +++ b/libavcodec/libxevd.c
> > @@ -534,5 +534,5 @@ const FFCodec ff_libxevd_decoder = {
> >      .p.capabilities     = AV_CODEC_CAP_DELAY |
> AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING,
> >      .p.profiles         = NULL_IF_CONFIG_SMALL(ff_evc_profiles),
> >      .p.wrapper_name     = "libxevd",
> > -    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP |
> FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS |
> FF_CODEC_CAP_SETS_FRAME_PROPS
> > +    .caps_internal      = FF_CODEC_CAP_INIT_CLEANUP |
> FF_CODEC_CAP_NOT_INIT_THREADSAFE |
> FF_CODEC_CAP_SETS_FRAME_PROPS
> >  };
> 
> Will apply this patchset tomorrow unless there are objections.
> 
No objections. It has been checked. Looks good.

> - Andreas
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://protect2.fireeye.com/v1/url?k=2ba11787-4adabd0f-2ba09cc8-
> 74fe4860018a-c9fa419a18ec0235&q=1&e=1f7f95c0-bdda-4754-9900-
> 6c849de896ad&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp
> eg-devel
> 
> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org
> with subject "unsubscribe".

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

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