lavc: add a sample_aspect_ratio field to AVFrame

The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.

3 files changed, 10 insertions, 0 deletions

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5d39b98123..eb6826bcb0 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1258,6 +1258,13 @@ typedef struct AVFrame {
      * decoding: set by AVCodecContext.get_buffer()
      */
     uint8_t **extended_data;
+
+    /**
+     * sample aspect ratio for the video frame, 0/1 if unknown\unspecified
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    AVRational sample_aspect_ratio;
 } AVFrame;
 
 struct AVCodecInternal;
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index f842edf861..17dd12da6c 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -599,6 +599,7 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
         *picture = p->frame;
         *got_picture_ptr = p->got_frame;
         picture->pkt_dts = p->avpkt.dts;
+        picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
 
         /*
          * A later call with avkpt->size == 0 may loop over all threads,
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7e9ddb2e35..7c1a7aea2a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -584,6 +584,7 @@ void avcodec_get_frame_defaults(AVFrame *pic){
 
     pic->pts= AV_NOPTS_VALUE;
     pic->key_frame= 1;
+    pic->sample_aspect_ratio = (AVRational){0, 1};
 }
 
 AVFrame *avcodec_alloc_frame(void){
@@ -858,6 +859,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
             ret = avctx->codec->decode(avctx, picture, got_picture_ptr,
                               avpkt);
             picture->pkt_dts= avpkt->dts;
+            picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
         }
 
         emms_c(); //needed to avoid an emms_c() call before every return;