1. 08 Apr, 2015 1 commit
    • wm4's avatar
      matroskadec: export cover art correctly · c4d37cd9
      wm4 authored
      Generally, libavformat exports cover art pictures as video streams with
      1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
      it as attachment with codec_id set to AV_CODEC_ID_MJPEG.
      
      Obviously, this should be consistent, so change the Matroska demuxer to
      export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.
      
      Matroska muxing is probably incorrect too. I know that it can create
      broken files with an audio track and just 1 video frame when e.g.
      remuxing mp3 with APIC to mkv. But for now this commit does not change
      anything about muxing, and also continues to write attachments with
      AV_CODEC_ID_MJPEG should the muxer application have special knowledge
      that the Matroska is broken in this way.
      Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
      c4d37cd9
  2. 04 Apr, 2015 1 commit
    • wm4's avatar
      matroskadec: export cover art correctly · 511585ce
      wm4 authored
      Generally, libavformat exports cover art pictures as video streams with
      1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
      it as attachment with codec_id set to AV_CODEC_ID_MJPEG.
      
      Obviously, this should be consistent, so change the Matroska demuxer to
      export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.
      
      Matroska muxing is probably incorrect too. I know that it can create
      broken files with an audio track and just 1 video frame when e.g.
      remuxing mp3 with APIC to mkv. But for now this commit does not change
      anything about muxing, and also continues to write attachments with
      AV_CODEC_ID_MJPEG should the muxer application have special knowledge
      that the Matroska is broken in this way.
      
      Fixes trac #4423.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      511585ce
  3. 15 Mar, 2015 1 commit
  4. 30 Sep, 2014 1 commit
  5. 09 Sep, 2014 1 commit
  6. 28 Aug, 2014 2 commits
  7. 24 Aug, 2014 1 commit
  8. 01 May, 2014 1 commit
  9. 29 Apr, 2014 1 commit
  10. 31 Oct, 2013 1 commit
  11. 15 Oct, 2013 1 commit
  12. 12 Sep, 2013 1 commit
  13. 19 Aug, 2013 1 commit
  14. 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
  15. 21 Feb, 2013 1 commit
  16. 01 Feb, 2013 1 commit
  17. 24 Jan, 2013 1 commit
  18. 16 Jan, 2013 1 commit
    • Nicolas George's avatar
      lafv/matroska: add A_OPUS/EXPERIMENTAL codec name. · 0942aa46
      Nicolas George authored
      The exact packing of Opus inside Matroska is not finalized.
      Use A_OPUS/EXPERIMENTAL as codec name, like mkvtoolnix.
      The A_OPUS name stays to let ffmpeg open files it has produced
      until now, but newly produced file use the EXPERIMENTAL version.
      Once the spec is stabilized it will be possible to consider
      options to ensure compatibility with these files.
      0942aa46
  19. 14 Jan, 2013 1 commit
  20. 06 Jan, 2013 1 commit
  21. 19 Sep, 2012 2 commits
  22. 16 Sep, 2012 1 commit
  23. 10 Sep, 2012 1 commit
  24. 25 Aug, 2012 1 commit
    • Philip Langdale's avatar
      matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles. · 2626cc45
      Philip Langdale authored
      While not explicitly stated in the specs, the original author
      has stated that S_TEXT/UTF-8 is expected to be text using Subrip
      markup, but without Subrip in-band timing.
      
      So, now that we have a decoder that conforms to this expectation,
      let's use it.
      
      Note that this change will impact tools that use libavformat. If
      they expect srt subtitles to have CODEC_ID_TEXT, they must be
      adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously,
      unchanged.
      Signed-off-by: 's avatarPhilip Langdale <philipl@overt.org>
      2626cc45
  25. 07 Aug, 2012 1 commit
  26. 05 Aug, 2012 1 commit
  27. 20 Jul, 2012 1 commit
  28. 24 May, 2011 1 commit
  29. 23 May, 2011 1 commit
  30. 19 Mar, 2011 1 commit
  31. 25 Jul, 2010 1 commit
  32. 19 May, 2010 1 commit
  33. 12 Mar, 2010 1 commit
  34. 01 Feb, 2010 1 commit
  35. 27 Jan, 2010 1 commit
  36. 30 Mar, 2009 1 commit
  37. 01 Mar, 2009 1 commit
  38. 12 Dec, 2008 1 commit