1. 03 Sep, 2013 1 commit
  2. 19 Aug, 2013 1 commit
  3. 18 Aug, 2013 2 commits
    • Michael Niedermayer's avatar
      avformat/matroskadec: check out_samplerate before using it in av_rescale() · 338f8b2e
      Michael Niedermayer authored
      Prevent assertion failure with damaged input
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      338f8b2e
    • James Almer's avatar
      matroskadec: Improve TTA duration calculation · af248fa1
      James Almer authored
      Calculate the duration as accurately as possible to improve decoding of samples
      where the last frame is smaller than the rest.
      
      Example:
      Take lossless-audio/luckynight-partial.tak from the FATE suit and convert it
      to TTA muxed into matroska:
      
      ffmpeg -i $(SAMPLES)/lossless-audio/luckynight-partial.tak -c:a tta lucky.mka
      
      The framemd5 output for lucky.mka without this patch:
      
      0,          0,          0,    46080,   184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a
      0,      46080,      46080,    46080,   184320, 6b70c782ba1da3f933fde2daa4f96b73
      0,      92160,      92160,    46080,   184320, dcf70d89c54b9a4f0b302d4ec4fb302d
      0,     138240,     138240,    46080,   184320, 48713ca38b388d2ea4abf5b86ed1226f
      0,     184320,     184320,    46080,   184320, 12188a23648e7ebfb07cd6fe9197b2ea
      0,     230400,     230400,    46080,   184320, 49653ab8186a5d4a044ed284671a26e0
      0,     276480,     276480,    46080,   184320, 5e82c6a7fe58c7ea612c03a0a2927dd4
      0,     322560,     322560,    46080,   184320, 83dc449dbd9eab5f2e8ad2b4403d6a21
      0,     368640,     368640,    46080,   184320, bdd6b92c23d30978d4e802d305b0fc49
      
      With this patch:
      
      0,          0,          0,    46080,   184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a
      0,      46080,      46080,    46080,   184320, 6b70c782ba1da3f933fde2daa4f96b73
      0,      92160,      92160,    46080,   184320, dcf70d89c54b9a4f0b302d4ec4fb302d
      0,     138240,     138240,    46080,   184320, 48713ca38b388d2ea4abf5b86ed1226f
      0,     184320,     184320,    46080,   184320, 12188a23648e7ebfb07cd6fe9197b2ea
      0,     230400,     230400,    46080,   184320, 49653ab8186a5d4a044ed284671a26e0
      0,     276480,     276480,    46080,   184320, 5e82c6a7fe58c7ea612c03a0a2927dd4
      0,     322560,     322560,    46080,   184320, 83dc449dbd9eab5f2e8ad2b4403d6a21
      0,     368640,     368640,    46080,   184320, bdd6b92c23d30978d4e802d305b0fc49
      0,     414720,     414720,     4230,    16920, b50b440c5bbcecb8e9fbece643447593
      
      The duration without this patch was calculated as 418950000000, which is bigger
      than uint32_t and as such stored as 2338172288.
      With this patch the duration is correctly calculated as 418950.
      Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
      Approved-by: 's avatarPaul B Mahol <onemda@gmail.com>
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      af248fa1
  4. 04 Aug, 2013 1 commit
  5. 15 Jul, 2013 1 commit
  6. 10 Jun, 2013 1 commit
  7. 08 Jun, 2013 1 commit
  8. 03 Jun, 2013 2 commits
  9. 28 May, 2013 1 commit
  10. 27 May, 2013 1 commit
  11. 26 May, 2013 1 commit
  12. 19 May, 2013 1 commit
  13. 07 May, 2013 1 commit
  14. 04 May, 2013 1 commit
  15. 18 Apr, 2013 1 commit
    • Clément Bœsch's avatar
      subtitles: introduce ASS codec id and use it. · 7c1a002c
      Clément Bœsch authored
      Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
      markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
      data starts with a "Dialogue:" string, followed by a timing information
      (start and end of the event as string) and a trailing CRLF after each
      line. One packet can contain several lines. We'll refer to this layout
      as "SSA" or "SSA lines".
      
      In matroska, this markup is not stored as such: it has no "Dialogue:"
      prefix, it contains a ReadOrder field, the timing information is not in
      the payload, and it doesn't contain the trailing CRLF. See [1] for more
      info. We'll refer to this layout as "ASS".
      
      Since we have only one common codec for both formats, the matroska
      demuxer is constructing an AVPacket following the "SSA lines" format.
      This causes several problems, so it was decided to change this into
      clean ASS packets.
      
      Some insight about what is changed or unchanged in this commit:
      
        CODECS
        ------
      
        - the decoding process still writes "SSA lines" markup inside the ass
          fields of the subtitles rectangles (sub->rects[n]->ass), which is
          still the current common way of representing decoded subtitles
          markup. It is meant to change later.
      
        - new ASS codec id: AV_CODEC_ID_ASS (which is different from the
          legacy AV_CODEC_ID_SSA)
      
        - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
          "ass") for consistency with the codec id and allows to add a real
          ass decoder. This ass decoder receives clean ASS lines (so it starts
          with a ReadOrder, is followed by the Layer, etc). We make sure this
          is decoded properly in a new ass-line rectangle of the decoded
          subtitles (the ssa decoder OTOH is doing a simple straightforward
          copy). Using the packet timing instead of data string makes sure the
          ass-line now contains the appropriate timing.
      
        - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
          into "ssa" (instead of "ass") for consistency with the codec id, and
          allows to add a real "ass" encoder.
      
          One important thing about this encoder is that it only supports one
          ass rectangle: we could have put several dialogue events in the
          AVPacket (separated by a \0 for instance) but this would have cause
          trouble for the muxer which needs not only the start time, but also
          the duration: typically, you have merged events with the same start
          time (stored in the AVPacket->pts) but a different duration. At the
          moment, only the matroska do the merge with the SSA-line codec.
      
          We will need to make sure all the decoders in the future can't add
          more than one rectangle (and only one Dialogue line in it
          obviously).
      
        FORMATS
        -------
      
        - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
          In the case of ASS packets as input, it adds the timing based on the
          AVPacket pts and duration, and mux it with "Dialogue:", trailing
          CRLF, etc.
      
        - lavf/assdec: unchanged; it currently still only outputs SSA-lines
          packets.
      
        - lavf/mkv: the demuxer can now output ASS packets without the need of
          any "SSA-lines" reconstruction hack. It will become the default at
          next libavformat bump, and the SSA support will be dropped from the
          demuxer. The muxer can take ASS packets since it's muxed normally,
          and still supports the old SSA packets. All the SSA support and
          hacks in Matroska code will be dropped at next lavf bump.
      
      [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
      7c1a002c
  16. 04 Apr, 2013 3 commits
  17. 03 Apr, 2013 4 commits
  18. 27 Mar, 2013 1 commit
  19. 22 Mar, 2013 1 commit
  20. 20 Mar, 2013 1 commit
  21. 19 Mar, 2013 1 commit
  22. 15 Mar, 2013 1 commit
  23. 12 Mar, 2013 1 commit
  24. 11 Mar, 2013 1 commit
  25. 08 Mar, 2013 1 commit
  26. 14 Feb, 2013 2 commits
  27. 13 Feb, 2013 2 commits
  28. 07 Feb, 2013 1 commit
  29. 24 Jan, 2013 1 commit
  30. 10 Jan, 2013 1 commit
  31. 04 Jan, 2013 1 commit