diff mbox

[FFmpeg-devel,RFC/PATCH] lavf/omadec: Fix timestamps for Atrac 3 lossless

Message ID CAB0OVGrtxNDn=e7ky9=vrCP1g7usBP8TTW3jie49yYE4Zat=dQ@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos Feb. 11, 2017, 5:54 p.m. UTC
2017-02-11 18:25 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
> On 2/11/17, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>> 2017-02-11 14:32 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
>>> On 2/11/17, Carl Eugen Hoyos <cehoyos@ag.or.at> wrote:
>>
>>>> Attached patch fixes timestamps and duration for
>>>> atrac_3_lossless_132kbps.aa3
>>>> from ticket #5334, the only Atrac 3 lossless sample I have.
>>>>
>>>> Please comment, Carl Eugen
>>>
>>> This is wrong thing to do, packets duration should be half
>>> of what is set for atrac3al.
>>
>> Where can this be done?
>
> In demuxer, when packet duration is set.

New try attached.

Thank you, Carl Eugen

Comments

Paul B Mahol Feb. 11, 2017, 5:58 p.m. UTC | #1
On 2/11/17, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> 2017-02-11 18:25 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
>> On 2/11/17, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>>> 2017-02-11 14:32 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
>>>> On 2/11/17, Carl Eugen Hoyos <cehoyos@ag.or.at> wrote:
>>>
>>>>> Attached patch fixes timestamps and duration for
>>>>> atrac_3_lossless_132kbps.aa3
>>>>> from ticket #5334, the only Atrac 3 lossless sample I have.
>>>>>
>>>>> Please comment, Carl Eugen
>>>>
>>>> This is wrong thing to do, packets duration should be half
>>>> of what is set for atrac3al.
>>>
>>> Where can this be done?
>>
>> In demuxer, when packet duration is set.
>
> New try attached.
>
> Thank you, Carl Eugen
>

lgtm
Carl Eugen Hoyos Feb. 11, 2017, 6:06 p.m. UTC | #2
2017-02-11 18:58 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
> On 2/11/17, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>> 2017-02-11 18:25 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
>>> On 2/11/17, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>>>> 2017-02-11 14:32 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
>>>>> On 2/11/17, Carl Eugen Hoyos <cehoyos@ag.or.at> wrote:
>>>>
>>>>>> Attached patch fixes timestamps and duration for
>>>>>> atrac_3_lossless_132kbps.aa3
>>>>>> from ticket #5334, the only Atrac 3 lossless sample I have.
>>>>>>
>>>>>> Please comment, Carl Eugen
>>>>>
>>>>> This is wrong thing to do, packets duration should be half
>>>>> of what is set for atrac3al.
>>>>
>>>> Where can this be done?
>>>
>>> In demuxer, when packet duration is set.
>>
>> New try attached.
>>
>> Thank you, Carl Eugen
>>
>
> lgtm

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

From 40b6497e7716372545083be6704058afb2d404e4 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sat, 11 Feb 2017 18:53:18 +0100
Subject: [PATCH] lavf/omadec: Fix packet duration for Atrac 3 lossless.

---
 libavformat/omadec.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 321e77e..fa53636 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -374,8 +374,13 @@  static int aal_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     pkt->stream_index = 0;
     pkt->pos = pos;
-    pkt->pts = pts * 2048LL;
-    pkt->duration = 2048;
+    if (s->streams[0]->codecpar->codec_id == AV_CODEC_ID_ATRAC3AL) {
+        pkt->duration = 1024;
+        pkt->pts = pts * 1024LL;
+    } else {
+        pkt->duration = 2048;
+        pkt->pts = pts * 2048LL;
+    }
 
     return ret;
 }
-- 
1.7.10.4