highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/smacker: export sample_aspect_ratio

Browse Source 
Partially fixes #10617
This commit is contained in:
Anton Khirnov
2023-10-27 09:52:42 +02:00
parent 1a7a85137e
commit ad3df6bf35
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/smacker.c
View File

@@ -34,6 +34,8 @@
#define SMACKER_PAL 0x01 #define SMACKER_PAL 0x01
#define SMACKER_FLAG_RING_FRAME 0x01 #define SMACKER_FLAG_RING_FRAME 0x01
#define SMACKER_FLAG_Y_INTERLACE (1 << 1)
#define SMACKER_FLAG_Y_DOUBLE (1 << 2)
enum SAudFlags { enum SAudFlags {
SMK_AUD_PACKED = 0x80, SMK_AUD_PACKED = 0x80,
@@ -144,6 +146,9 @@ static int smacker_read_header(AVFormatContext *s)
avpriv_set_pts_info(st, 33, pts_inc, tbase); avpriv_set_pts_info(st, 33, pts_inc, tbase);
st->duration = smk->frames; st->duration = smk->frames;
st->sample_aspect_ratio = (AVRational){ 1, 1 +
!!(flags & (SMACKER_FLAG_Y_INTERLACE | SMACKER_FLAG_Y_DOUBLE)) };
/* init video codec */ /* init video codec */
par = st->codecpar; par = st->codecpar;
par->width = width; par->width = width;

2
tests/ref/fate/smacker-video
View File

@@ -2,7 +2,7 @@
#media_type 0: video #media_type 0: video
#codec_id 0: rawvideo #codec_id 0: rawvideo
#dimensions 0: 320x200 #dimensions 0: 320x200
#sar 0: 0/1 #sar 0: 1/1
0, 0, 0, 1, 192000, 0x8926d7fc 0, 0, 0, 1, 192000, 0x8926d7fc
0, 1, 1, 1, 192000, 0x2506d384 0, 1, 1, 1, 192000, 0x2506d384
0, 2, 2, 1, 192000, 0x9a8dc93a 0, 2, 2, 1, 192000, 0x9a8dc93a