comparison libmpdemux/demux_mkv.c @ 14843:bbb693d3b130

Fix the ogg fourcc nightmare!!! The problem: once upon a time, windows idiots decided to try to store vorbis-in-ogg-in-avi. Of course this failed miserably, but they used the audio format tag 0xfffe for "extended" to do this. Later someone working on MPlayer somehow decided 0xfffe was the format for vorbis, which is nonsense, and now that's conflicting with real wav files with extended audio format. This patch changes demux_ogg (and mkv) to use sane fourcc's for vorbis and theora and gets rid of the 0xfffe nonsense so hopefully wav files with extended audio will work now. If there are problems, we'll have to find workarounds...and drive an 18-wheeler full of cola thru the house of whoever wrote this 0xfffe nonsense in MPlayer to begin with...

14842:31ab04004943

          track->headers[2] = &c[offset + track->header_sizes[0] +
                                 track->header_sizes[1]];
          track->header_sizes[2] = track->private_size - offset
            - track->header_sizes[0] - track->header_sizes[1];

          track->a_formattag = 0xFFFE;
        }
      else if (!strcmp(track->codec_id, MKV_A_QDMC))
        track->a_formattag = mmioFOURCC('Q', 'D', 'M', 'C');
      else if (!strcmp(track->codec_id, MKV_A_QDMC2))
        track->a_formattag = mmioFOURCC('Q', 'D', 'M', '2');

        {
          sh_a->codecdata_len = 2;
          track->default_duration = 1024.0 / (float)sh_a->samplerate;
        }
    }
  else if (track->a_formattag == 0xFFFE)  /* VORBIS */
    {
      for (i=0; i < 3; i++)
        {
          dp = new_demux_packet (track->header_sizes[i]);
          memcpy (dp->buffer,track->headers[i],track->header_sizes[i]);

14843:bbb693d3b130

          track->headers[2] = &c[offset + track->header_sizes[0] +
                                 track->header_sizes[1]];
          track->header_sizes[2] = track->private_size - offset
            - track->header_sizes[0] - track->header_sizes[1];

          track->a_formattag = mmioFOURCC('v', 'r', 'b', 's');
        }
      else if (!strcmp(track->codec_id, MKV_A_QDMC))
        track->a_formattag = mmioFOURCC('Q', 'D', 'M', 'C');
      else if (!strcmp(track->codec_id, MKV_A_QDMC2))
        track->a_formattag = mmioFOURCC('Q', 'D', 'M', '2');

        {
          sh_a->codecdata_len = 2;
          track->default_duration = 1024.0 / (float)sh_a->samplerate;
        }
    }
  else if (track->a_formattag == mmioFOURCC('v', 'r', 'b', 's'))  /* VORBIS */
    {
      for (i=0; i < 3; i++)
        {
          dp = new_demux_packet (track->header_sizes[i]);
          memcpy (dp->buffer,track->headers[i],track->header_sizes[i]);