diff mbox series

[FFmpeg-devel,3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible

Message ID 8082c3ab84a30299f1b8e930a877cf65c3b48b00.1653552529.git.ffmpegagent@gmail.com
State New
Headers show
Series Implement SEI parsing for QSV decoders | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Aman Karmani May 26, 2022, 8:08 a.m. UTC 
From: softworkz <softworkz@hotmail.com>

Signed-off-by: softworkz <softworkz@hotmail.com>
---
 libavcodec/mpeg12.h    | 28 ++++++++++++++++++++++++++++
 libavcodec/mpeg12dec.c | 40 +++++-----------------------------------
 2 files changed, 33 insertions(+), 35 deletions(-)

Comments

Xiang, Haihao May 31, 2022, 9:24 a.m. UTC | #1 
On Thu, 2022-05-26 at 08:08 +0000, softworkz wrote:
> From: softworkz <softworkz@hotmail.com>
> 
> Signed-off-by: softworkz <softworkz@hotmail.com>
> ---
>  libavcodec/mpeg12.h    | 28 ++++++++++++++++++++++++++++
>  libavcodec/mpeg12dec.c | 40 +++++-----------------------------------
>  2 files changed, 33 insertions(+), 35 deletions(-)
> 
> diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
> index e0406b32d9..84a829cdd3 100644
> --- a/libavcodec/mpeg12.h
> +++ b/libavcodec/mpeg12.h
> @@ -23,6 +23,7 @@
>  #define AVCODEC_MPEG12_H
>  
>  #include "mpegvideo.h"
> +#include "libavutil/stereo3d.h"
>  
>  /* Start codes. */
>  #define SEQ_END_CODE            0x000001b7
> @@ -34,6 +35,31 @@
>  #define EXT_START_CODE          0x000001b5
>  #define USER_START_CODE         0x000001b2
>  
> +typedef struct Mpeg1Context {
> +    MpegEncContext mpeg_enc_ctx;
> +    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
> +    int repeat_field;           /* true if we must repeat the field */
> +    AVPanScan pan_scan;         /* some temporary storage for the panscan */
> +    AVStereo3D stereo3d;
> +    int has_stereo3d;
> +    AVBufferRef *a53_buf_ref;
> +    uint8_t afd;
> +    int has_afd;
> +    int slice_count;
> +    unsigned aspect_ratio_info;
> +    AVRational save_aspect;
> +    int save_width, save_height, save_progressive_seq;
> +    int rc_buffer_size;
> +    AVRational frame_rate_ext;  /* MPEG-2 specific framerate modificator */
> +    unsigned frame_rate_index;
> +    int sync;                   /* Did we reach a sync point like a
> GOP/SEQ/KEYFrame? */
> +    int closed_gop;
> +    int tmpgexs;
> +    int first_slice;
> +    int extradata_decoded;
> +    int64_t timecode_frame_start;  /*< GOP timecode frame start number, in
> non drop frame format */
> +} Mpeg1Context;
> +
>  void ff_mpeg12_common_init(MpegEncContext *s);
>  
>  void ff_mpeg1_clean_buffers(MpegEncContext *s);
> @@ -45,4 +71,6 @@ void ff_mpeg12_find_best_frame_rate(AVRational frame_rate,
>                                      int *code, int *ext_n, int *ext_d,
>                                      int nonstandard);
>  
> +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const
> uint8_t *p, int buf_size);
> +
>  #endif /* AVCODEC_MPEG12_H */
> diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
> index e9bde48f7a..11d2b58185 100644
> --- a/libavcodec/mpeg12dec.c
> +++ b/libavcodec/mpeg12dec.c
> @@ -58,31 +58,6 @@
>  
>  #define A53_MAX_CC_COUNT 2000
>  
> -typedef struct Mpeg1Context {
> -    MpegEncContext mpeg_enc_ctx;
> -    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
> -    int repeat_field;           /* true if we must repeat the field */
> -    AVPanScan pan_scan;         /* some temporary storage for the panscan */
> -    AVStereo3D stereo3d;
> -    int has_stereo3d;
> -    AVBufferRef *a53_buf_ref;
> -    uint8_t afd;
> -    int has_afd;
> -    int slice_count;
> -    unsigned aspect_ratio_info;
> -    AVRational save_aspect;
> -    int save_width, save_height, save_progressive_seq;
> -    int rc_buffer_size;
> -    AVRational frame_rate_ext;  /* MPEG-2 specific framerate modificator */
> -    unsigned frame_rate_index;
> -    int sync;                   /* Did we reach a sync point like a
> GOP/SEQ/KEYFrame? */
> -    int closed_gop;
> -    int tmpgexs;
> -    int first_slice;
> -    int extradata_decoded;
> -    int64_t timecode_frame_start;  /*< GOP timecode frame start number, in
> non drop frame format */
> -} Mpeg1Context;
> -
>  #define MB_TYPE_ZERO_MV   0x20000000
>  
>  static const uint32_t ptype2mb_type[7] = {
> @@ -2198,11 +2173,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
>      return 0;
>  }
>  
> -static int mpeg_decode_a53_cc(AVCodecContext *avctx,
> +static int mpeg_decode_a53_cc(AVCodecContext *avctx, Mpeg1Context *s1,
>                                const uint8_t *p, int buf_size)
>  {
> -    Mpeg1Context *s1 = avctx->priv_data;
> -
>      if (buf_size >= 6 &&
>          p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' &&
>          p[4] == 3 && (p[5] & 0x40)) {
> @@ -2333,12 +2306,9 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx,
>      return 0;
>  }
>  
> -static void mpeg_decode_user_data(AVCodecContext *avctx,
> -                                  const uint8_t *p, int buf_size)
> +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const
> uint8_t *p, int buf_size)
>  {
> -    Mpeg1Context *s = avctx->priv_data;
>      const uint8_t *buf_end = p + buf_size;
> -    Mpeg1Context *s1 = avctx->priv_data;
>  
>  #if 0
>      int i;
> @@ -2352,7 +2322,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
>          int i;
>          for(i=0; i<20; i++)
>              if (!memcmp(p+i, "\0TMPGEXS\0", 9)){
> -                s->tmpgexs= 1;
> +                s1->tmpgexs= 1;
>              }
>      }
>      /* we parse the DTG active format information */
> @@ -2398,7 +2368,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
>                  break;
>              }
>          }
> -    } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) {
> +    } else if (mpeg_decode_a53_cc(avctx, s1, p, buf_size)) {
>          return;
>      }
>  }
> @@ -2590,7 +2560,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame
> *picture,
>              }
>              break;
>          case USER_START_CODE:
> -            mpeg_decode_user_data(avctx, buf_ptr, input_size);
> +            ff_mpeg_decode_user_data(avctx, s, buf_ptr, input_size);
>              break;
>          case GOP_START_CODE:
>              if (last_code == 0) {

LGTM

-Haihao
diff mbox series

Patch

diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index e0406b32d9..84a829cdd3 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -23,6 +23,7 @@ 
 #define AVCODEC_MPEG12_H
 
 #include "mpegvideo.h"
+#include "libavutil/stereo3d.h"
 
 /* Start codes. */
 #define SEQ_END_CODE            0x000001b7
@@ -34,6 +35,31 @@ 
 #define EXT_START_CODE          0x000001b5
 #define USER_START_CODE         0x000001b2
 
+typedef struct Mpeg1Context {
+    MpegEncContext mpeg_enc_ctx;
+    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
+    int repeat_field;           /* true if we must repeat the field */
+    AVPanScan pan_scan;         /* some temporary storage for the panscan */
+    AVStereo3D stereo3d;
+    int has_stereo3d;
+    AVBufferRef *a53_buf_ref;
+    uint8_t afd;
+    int has_afd;
+    int slice_count;
+    unsigned aspect_ratio_info;
+    AVRational save_aspect;
+    int save_width, save_height, save_progressive_seq;
+    int rc_buffer_size;
+    AVRational frame_rate_ext;  /* MPEG-2 specific framerate modificator */
+    unsigned frame_rate_index;
+    int sync;                   /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
+    int closed_gop;
+    int tmpgexs;
+    int first_slice;
+    int extradata_decoded;
+    int64_t timecode_frame_start;  /*< GOP timecode frame start number, in non drop frame format */
+} Mpeg1Context;
+
 void ff_mpeg12_common_init(MpegEncContext *s);
 
 void ff_mpeg1_clean_buffers(MpegEncContext *s);
@@ -45,4 +71,6 @@  void ff_mpeg12_find_best_frame_rate(AVRational frame_rate,
                                     int *code, int *ext_n, int *ext_d,
                                     int nonstandard);
 
+void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size);
+
 #endif /* AVCODEC_MPEG12_H */
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index e9bde48f7a..11d2b58185 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -58,31 +58,6 @@ 
 
 #define A53_MAX_CC_COUNT 2000
 
-typedef struct Mpeg1Context {
-    MpegEncContext mpeg_enc_ctx;
-    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
-    int repeat_field;           /* true if we must repeat the field */
-    AVPanScan pan_scan;         /* some temporary storage for the panscan */
-    AVStereo3D stereo3d;
-    int has_stereo3d;
-    AVBufferRef *a53_buf_ref;
-    uint8_t afd;
-    int has_afd;
-    int slice_count;
-    unsigned aspect_ratio_info;
-    AVRational save_aspect;
-    int save_width, save_height, save_progressive_seq;
-    int rc_buffer_size;
-    AVRational frame_rate_ext;  /* MPEG-2 specific framerate modificator */
-    unsigned frame_rate_index;
-    int sync;                   /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
-    int closed_gop;
-    int tmpgexs;
-    int first_slice;
-    int extradata_decoded;
-    int64_t timecode_frame_start;  /*< GOP timecode frame start number, in non drop frame format */
-} Mpeg1Context;
-
 #define MB_TYPE_ZERO_MV   0x20000000
 
 static const uint32_t ptype2mb_type[7] = {
@@ -2198,11 +2173,9 @@  static int vcr2_init_sequence(AVCodecContext *avctx)
     return 0;
 }
 
-static int mpeg_decode_a53_cc(AVCodecContext *avctx,
+static int mpeg_decode_a53_cc(AVCodecContext *avctx, Mpeg1Context *s1,
                               const uint8_t *p, int buf_size)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
-
     if (buf_size >= 6 &&
         p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' &&
         p[4] == 3 && (p[5] & 0x40)) {
@@ -2333,12 +2306,9 @@  static int mpeg_decode_a53_cc(AVCodecContext *avctx,
     return 0;
 }
 
-static void mpeg_decode_user_data(AVCodecContext *avctx,
-                                  const uint8_t *p, int buf_size)
+void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size)
 {
-    Mpeg1Context *s = avctx->priv_data;
     const uint8_t *buf_end = p + buf_size;
-    Mpeg1Context *s1 = avctx->priv_data;
 
 #if 0
     int i;
@@ -2352,7 +2322,7 @@  static void mpeg_decode_user_data(AVCodecContext *avctx,
         int i;
         for(i=0; i<20; i++)
             if (!memcmp(p+i, "\0TMPGEXS\0", 9)){
-                s->tmpgexs= 1;
+                s1->tmpgexs= 1;
             }
     }
     /* we parse the DTG active format information */
@@ -2398,7 +2368,7 @@  static void mpeg_decode_user_data(AVCodecContext *avctx,
                 break;
             }
         }
-    } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) {
+    } else if (mpeg_decode_a53_cc(avctx, s1, p, buf_size)) {
         return;
     }
 }
@@ -2590,7 +2560,7 @@  static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
             }
             break;
         case USER_START_CODE:
-            mpeg_decode_user_data(avctx, buf_ptr, input_size);
+            ff_mpeg_decode_user_data(avctx, s, buf_ptr, input_size);
             break;
         case GOP_START_CODE:
             if (last_code == 0) {