[FFmpeg-devel] [PATCH]Support DVD-A files containing LPCM

[Carl Eugen Hoyos]

On Wednesday 31 July 2013 01:34:54 am Carl Eugen Hoyos wrote:
> On Monday 29 July 2013 08:29:09 pm Kirill Gavrilov wrote:
> > On Mon, Jul 29, 2013 at 3:18 PM, Carl Eugen Hoyos wrote:
> > > I cannot implement >16bit or multichannel without samples.
> >
> > If it was request - you can try this 10 MiB cut sample:
> > http://sview.cifro-city.ru/trash/ats.AOB
>
> Thank you!
>
> New patch attached, 20bit is untested.

New patch attached that sets channel_layout.

Please review, Carl Eugen
-------------- next part --------------
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 5d5b09f..ec90f05 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -581,6 +581,51 @@ static int mpegps_read_packet(AVFormatContext *s,
                 goto skip;
             avio_skip(s->pb, 6);
             len -=6;
+      } else if (lpcm_header_len > 8 && startcode == 0xa0) {
+          // DVD-A LPCM audio
+          int sample_rates[] = { 48000, 96000, 192000,
+                                 0, 0, 0, 0, 0,
+                                 44100, 88200, 176400,
+                                 0, 0, 0, 0, 0 };
+          avio_skip(s->pb, 2); // Pointer to start of audio frame
+          avio_skip(s->pb, 1); // Unknown
+          switch (avio_r8(s->pb) >> 4) {
+          case 2:
+              st->codec->codec_id = AV_CODEC_ID_PCM_DVD;
+              st->codec->bits_per_coded_sample = 24;
+              break;
+          case 1:
+              st->codec->codec_id = AV_CODEC_ID_PCM_DVD;
+              st->codec->bits_per_coded_sample = 20;
+              break;
+          case 0:
+              st->codec->codec_id = AV_CODEC_ID_PCM_S16BE;
+              st->codec->bits_per_coded_sample = 16;
+              break;
+          default:
+              len -= 4;
+              goto skip;
+          }
+          st->codec->sample_rate = sample_rates[avio_r8(s->pb) >> 4];
+          len -= 5;
+          if (!st->codec->sample_rate)
+              goto skip;
+          avio_skip(s->pb, 1); // Unknown
+          switch (avio_r8(s->pb)) {
+          case 0:
+              st->codec->channels = 1;
+              st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+              break;
+          case 1:
+              st->codec->channels = 2;
+              st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+              break;
+          default:
+              avpriv_request_sample(s, "Multichannel DVD-A LPCM audio");
+              return AVERROR_PATCHWELCOME;
+          }
+          avio_skip(s->pb, lpcm_header_len - 7);
+          len -= lpcm_header_len - 5;
       } else {
         int b1, freq;