[FFmpeg-devel,v1,04/14] avformat/avidec: add logging context to log

Submitted by Steven Liu on Sept. 30, 2019, 7:17 a.m.

Details

Message ID 20190930071751.5919-4-lq@chinaffmpeg.org
State New
Headers show

Commit Message

Steven Liu Sept. 30, 2019, 7:17 a.m.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/avidec.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Andriy Gelman Sept. 30, 2019, 11:58 a.m.
On Mon, 30. Sep 15:17, Steven Liu wrote:
> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
> ---
>  libavformat/avidec.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/libavformat/avidec.c b/libavformat/avidec.c
> index e3cd844169..a492b3d037 100644
> --- a/libavformat/avidec.c
> +++ b/libavformat/avidec.c
> @@ -117,7 +117,7 @@ static const AVMetadataConv avi_metadata_conv[] = {
>  static int avi_load_index(AVFormatContext *s);
>  static int guess_ni_flag(AVFormatContext *s);
>  

> -#define print_tag(str, tag, size)                                      \
> +#define print_tag(s, str, tag, size)                                      \
>      av_log(NULL, AV_LOG_TRACE, "pos:%"PRIX64" %s: tag=%s size=0x%x\n", \
>             avio_tell(pb), str, av_fourcc2str(tag), size)                  \

I guess NULL is supposed to be s

>  
> @@ -504,7 +504,7 @@ static int avi_read_header(AVFormatContext *s)
>          tag  = avio_rl32(pb);
>          size = avio_rl32(pb);
>  
> -        print_tag("tag", tag, size);
> +        print_tag(s, "tag", tag, size);
>  
>          switch (tag) {
>          case MKTAG('L', 'I', 'S', 'T'):
> @@ -512,7 +512,7 @@ static int avi_read_header(AVFormatContext *s)
>              /* Ignored, except at start of video packets. */
>              tag1 = avio_rl32(pb);
>  
> -            print_tag("list", tag1, 0);
> +            print_tag(s, "list", tag1, 0);
>  
>              if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
>                  avi->movi_list = avio_tell(pb) - 4;
> @@ -520,7 +520,7 @@ static int avi_read_header(AVFormatContext *s)
>                      avi->movi_end = avi->movi_list + size + (size & 1);
>                  else
>                      avi->movi_end = avi->fsize;
> -                av_log(NULL, AV_LOG_TRACE, "movi end=%"PRIx64"\n", avi->movi_end);
> +                av_log(s, AV_LOG_TRACE, "movi end=%"PRIx64"\n", avi->movi_end);
>                  goto end_of_header;
>              } else if (tag1 == MKTAG('I', 'N', 'F', 'O'))
>                  ff_read_riff_info(s, size - 4);
> @@ -584,7 +584,7 @@ static int avi_read_header(AVFormatContext *s)
>                  tag1 = stream_index ? MKTAG('a', 'u', 'd', 's')
>                                      : MKTAG('v', 'i', 'd', 's');
>  
> -            print_tag("strh", tag1, -1);
> +            print_tag(s, "strh", tag1, -1);
>  
>              if (tag1 == MKTAG('i', 'a', 'v', 's') ||
>                  tag1 == MKTAG('i', 'v', 'a', 's')) {
> @@ -802,7 +802,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
>                          ast->has_pal = 1;
>                      }
>  
> -                    print_tag("video", tag1, 0);
> +                    print_tag(s, "video", tag1, 0);
>  
>                      st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
>                      st->codecpar->codec_tag  = tag1;
> -- 
> 2.15.1
>

Patch hide | download patch | download mbox

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index e3cd844169..a492b3d037 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -117,7 +117,7 @@  static const AVMetadataConv avi_metadata_conv[] = {
 static int avi_load_index(AVFormatContext *s);
 static int guess_ni_flag(AVFormatContext *s);
 
-#define print_tag(str, tag, size)                                      \
+#define print_tag(s, str, tag, size)                                      \
     av_log(NULL, AV_LOG_TRACE, "pos:%"PRIX64" %s: tag=%s size=0x%x\n", \
            avio_tell(pb), str, av_fourcc2str(tag), size)                  \
 
@@ -504,7 +504,7 @@  static int avi_read_header(AVFormatContext *s)
         tag  = avio_rl32(pb);
         size = avio_rl32(pb);
 
-        print_tag("tag", tag, size);
+        print_tag(s, "tag", tag, size);
 
         switch (tag) {
         case MKTAG('L', 'I', 'S', 'T'):
@@ -512,7 +512,7 @@  static int avi_read_header(AVFormatContext *s)
             /* Ignored, except at start of video packets. */
             tag1 = avio_rl32(pb);
 
-            print_tag("list", tag1, 0);
+            print_tag(s, "list", tag1, 0);
 
             if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
                 avi->movi_list = avio_tell(pb) - 4;
@@ -520,7 +520,7 @@  static int avi_read_header(AVFormatContext *s)
                     avi->movi_end = avi->movi_list + size + (size & 1);
                 else
                     avi->movi_end = avi->fsize;
-                av_log(NULL, AV_LOG_TRACE, "movi end=%"PRIx64"\n", avi->movi_end);
+                av_log(s, AV_LOG_TRACE, "movi end=%"PRIx64"\n", avi->movi_end);
                 goto end_of_header;
             } else if (tag1 == MKTAG('I', 'N', 'F', 'O'))
                 ff_read_riff_info(s, size - 4);
@@ -584,7 +584,7 @@  static int avi_read_header(AVFormatContext *s)
                 tag1 = stream_index ? MKTAG('a', 'u', 'd', 's')
                                     : MKTAG('v', 'i', 'd', 's');
 
-            print_tag("strh", tag1, -1);
+            print_tag(s, "strh", tag1, -1);
 
             if (tag1 == MKTAG('i', 'a', 'v', 's') ||
                 tag1 == MKTAG('i', 'v', 'a', 's')) {
@@ -802,7 +802,7 @@  FF_ENABLE_DEPRECATION_WARNINGS
                         ast->has_pal = 1;
                     }
 
-                    print_tag("video", tag1, 0);
+                    print_tag(s, "video", tag1, 0);
 
                     st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
                     st->codecpar->codec_tag  = tag1;