diff mbox series

[FFmpeg-devel] Add vps/sps/pps id set to hevc_metadata bsf

Message ID 20200107085155.6846-1-eran.gonen@cloudinary.com
State New
Headers show
Series [FFmpeg-devel] Add vps/sps/pps id set to hevc_metadata bsf | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Eran Gonen Jan. 7, 2020, 8:51 a.m. UTC 
---
 libavcodec/h265_metadata_bsf.c | 147 +++++++++++++++++++++++++++++----
 1 file changed, 129 insertions(+), 18 deletions(-)

Comments

Moritz Barsnick Jan. 7, 2020, 12:02 p.m. UTC | #1 
On Tue, Jan 07, 2020 at 10:51:55 +0200, Eran Gonen wrote:
> Subject: Add vps/sps/pps id set to hevc_metadata bsf

Please use:
avcodec/h265_metadata_bsf: [...]

> +    if(ctx->vps_id > -1) {

Code style: "if (" (i.e. space before the bracket here).
Also in various other places in your code.

> +            case HEVC_NAL_VPS:
> +                err = h265_metadata_update_vps(bsf, au->units[i].content);
> +                if (err < 0)
> +                    goto fail;
> +                    break;

Incorrect indentation. (Also the other "break"s.)

Moritz
Eran Gonen Jan. 7, 2020, 1:24 p.m. UTC | #2 
Thanks, I will fix that. What's the formatter parameters for that? (AStyle
or other)

On Tue, Jan 7, 2020 at 2:02 PM Moritz Barsnick <barsnick@gmx.net> wrote:

> On Tue, Jan 07, 2020 at 10:51:55 +0200, Eran Gonen wrote:
> > Subject: Add vps/sps/pps id set to hevc_metadata bsf
>
> Please use:
> avcodec/h265_metadata_bsf: [...]
>
> > +    if(ctx->vps_id > -1) {
>
> Code style: "if (" (i.e. space before the bracket here).
> Also in various other places in your code.
>
> > +            case HEVC_NAL_VPS:
> > +                err = h265_metadata_update_vps(bsf,
> au->units[i].content);
> > +                if (err < 0)
> > +                    goto fail;
> > +                    break;
>
> Incorrect indentation. (Also the other "break"s.)
>
> Moritz
> _______________________________________________
> 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".
Moritz Barsnick Jan. 8, 2020, 10:17 a.m. UTC | #3 
On Tue, Jan 07, 2020 at 15:24:53 +0200, Eran Gonen wrote:
> Thanks, I will fix that. What's the formatter parameters for that? (AStyle
> or other)

See https://www.ffmpeg.org/developer.html#Coding-Rules-1
$ indent -i4 -kr -nut
(approximately)

I haven't used astyle so much (only trial-and-error), but perhaps
others have.

Also check other files in the source code for inspiration, though some
don't comply.

Cheers,
Moritz
diff mbox series

Patch

diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c
index b3a1fda144..66ea369e0b 100644
--- a/libavcodec/h265_metadata_bsf.c
+++ b/libavcodec/h265_metadata_bsf.c
@@ -68,6 +68,10 @@  typedef struct H265MetadataContext {
     int level;
     int level_guess;
     int level_warned;
+
+    int vps_id;
+    int sps_id;
+    int pps_id;
 } H265MetadataContext;
 
 
@@ -168,6 +172,10 @@  static int h265_metadata_update_vps(AVBSFContext *bsf,
 {
     H265MetadataContext *ctx = bsf->priv_data;
 
+    if(ctx->vps_id > -1) {
+        vps->vps_video_parameter_set_id = ctx->vps_id;
+    }
+
     if (ctx->tick_rate.num && ctx->tick_rate.den) {
         int num, den;
 
@@ -200,6 +208,13 @@  static int h265_metadata_update_sps(AVBSFContext *bsf,
     int need_vui = 0;
     int crop_unit_x, crop_unit_y;
 
+    if(ctx->vps_id > -1) {
+        sps->sps_video_parameter_set_id = ctx->vps_id;
+    }
+    if(ctx->sps_id > -1) {
+        sps->sps_seq_parameter_set_id = ctx->sps_id;
+    }
+
     if (ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
         // Table E-1.
         static const AVRational sar_idc[] = {
@@ -336,6 +351,32 @@  static int h265_metadata_update_sps(AVBSFContext *bsf,
     return 0;
 }
 
+static int h265_metadata_update_pps(AVBSFContext *bsf,
+                                    H265RawPPS *pps)
+{
+    H265MetadataContext *ctx = bsf->priv_data;
+
+    if(ctx->sps_id > -1) {
+        pps->pps_seq_parameter_set_id = ctx->sps_id;
+    }
+    if(ctx->pps_id > -1) {
+        pps->pps_pic_parameter_set_id = ctx->pps_id;
+    }
+
+    return 0;
+}
+
+static int h265_metadata_update_slice_header(AVBSFContext *bsf,
+                                             H265RawSliceHeader *slice)
+{
+    H265MetadataContext *ctx = bsf->priv_data;
+
+    if(ctx->pps_id > -1) {
+        slice->slice_pic_parameter_set_id = ctx->pps_id;
+    }
+    return 0;
+}
+
 static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
 {
     H265MetadataContext *ctx = bsf->priv_data;
@@ -406,15 +447,45 @@  static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
         h265_metadata_guess_level(bsf, au);
 
     for (i = 0; i < au->nb_units; i++) {
-        if (au->units[i].type == HEVC_NAL_VPS) {
-            err = h265_metadata_update_vps(bsf, au->units[i].content);
-            if (err < 0)
-                goto fail;
-        }
-        if (au->units[i].type == HEVC_NAL_SPS) {
-            err = h265_metadata_update_sps(bsf, au->units[i].content);
-            if (err < 0)
-                goto fail;
+        switch (au->units[i].type) {
+            case HEVC_NAL_VPS:
+                err = h265_metadata_update_vps(bsf, au->units[i].content);
+                if (err < 0)
+                    goto fail;
+                    break;
+            case HEVC_NAL_SPS:
+                err = h265_metadata_update_sps(bsf, au->units[i].content);
+                if (err < 0)
+                    goto fail;
+                    break;
+            case HEVC_NAL_PPS:
+                err = h265_metadata_update_pps(bsf, au->units[i].content);
+                if (err < 0)
+                    goto fail;
+                    break;
+            case HEVC_NAL_SEI_PREFIX:
+            case HEVC_NAL_SEI_SUFFIX:
+                break;
+            case HEVC_NAL_TRAIL_N:
+            case HEVC_NAL_TRAIL_R:
+            case HEVC_NAL_TSA_N:
+            case HEVC_NAL_TSA_R:
+            case HEVC_NAL_STSA_N:
+            case HEVC_NAL_STSA_R:
+            case HEVC_NAL_BLA_W_LP:
+            case HEVC_NAL_BLA_W_RADL:
+            case HEVC_NAL_BLA_N_LP:
+            case HEVC_NAL_IDR_W_RADL:
+            case HEVC_NAL_IDR_N_LP:
+            case HEVC_NAL_CRA_NUT:
+            case HEVC_NAL_RADL_N:
+            case HEVC_NAL_RADL_R:
+            case HEVC_NAL_RASL_N:
+            case HEVC_NAL_RASL_R:
+                err = h265_metadata_update_slice_header(bsf, au->units[i].content);
+                if (err < 0)
+                    goto fail;
+                    break;
         }
     }
 
@@ -455,15 +526,45 @@  static int h265_metadata_init(AVBSFContext *bsf)
             h265_metadata_guess_level(bsf, au);
 
         for (i = 0; i < au->nb_units; i++) {
-            if (au->units[i].type == HEVC_NAL_VPS) {
-                err = h265_metadata_update_vps(bsf, au->units[i].content);
-                if (err < 0)
-                    goto fail;
-            }
-            if (au->units[i].type == HEVC_NAL_SPS) {
-                err = h265_metadata_update_sps(bsf, au->units[i].content);
-                if (err < 0)
-                    goto fail;
+            switch (au->units[i].type) {
+                    case HEVC_NAL_VPS:
+                        err = h265_metadata_update_vps(bsf, au->units[i].content);
+                        if (err < 0)
+                            goto fail;
+                            break;
+                    case HEVC_NAL_SPS:
+                        err = h265_metadata_update_sps(bsf, au->units[i].content);
+                        if (err < 0)
+                            goto fail;
+                            break;
+                    case HEVC_NAL_PPS:
+                        err = h265_metadata_update_pps(bsf, au->units[i].content);
+                        if (err < 0)
+                            goto fail;
+                            break;
+                    case HEVC_NAL_SEI_PREFIX:
+                    case HEVC_NAL_SEI_SUFFIX:
+                        break;
+                    case HEVC_NAL_TRAIL_N:
+                    case HEVC_NAL_TRAIL_R:
+                    case HEVC_NAL_TSA_N:
+                    case HEVC_NAL_TSA_R:
+                    case HEVC_NAL_STSA_N:
+                    case HEVC_NAL_STSA_R:
+                    case HEVC_NAL_BLA_W_LP:
+                    case HEVC_NAL_BLA_W_RADL:
+                    case HEVC_NAL_BLA_N_LP:
+                    case HEVC_NAL_IDR_W_RADL:
+                    case HEVC_NAL_IDR_N_LP:
+                    case HEVC_NAL_CRA_NUT:
+                    case HEVC_NAL_RADL_N:
+                    case HEVC_NAL_RADL_R:
+                    case HEVC_NAL_RASL_N:
+                    case HEVC_NAL_RASL_R:
+                        err = h265_metadata_update_slice_header(bsf, au->units[i].content);
+                        if (err < 0)
+                            goto fail;
+                            break;
             }
         }
 
@@ -547,6 +648,16 @@  static const AVOption h265_metadata_options[] = {
         OFFSET(crop_bottom), AV_OPT_TYPE_INT,
         { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS },
 
+    { "vps_id", "Set vps id",
+        OFFSET(vps_id), AV_OPT_TYPE_INT,
+        { .i64 = -1 }, -1, HEVC_MAX_VPS_COUNT, FLAGS },
+    { "sps_id", "Set sps id",
+        OFFSET(sps_id), AV_OPT_TYPE_INT,
+        { .i64 = -1 }, -1, HEVC_MAX_SPS_COUNT, FLAGS },
+    { "pps_id", "Set pps id",
+        OFFSET(pps_id), AV_OPT_TYPE_INT,
+        { .i64 = -1 }, -1, HEVC_MAX_PPS_COUNT, FLAGS },
+
     { "level", "Set level (tables A.6 and A.7)",
         OFFSET(level), AV_OPT_TYPE_INT,
         { .i64 = LEVEL_UNSET }, LEVEL_UNSET, 0xff, FLAGS, "level" },