comparison libmpdemux/demux_mkv.cpp @ 11482:a6b69309a791

Support for FLAC in Matroska written in the MS compatibility mode.

11481:64298443e494

      ((short *)(sh_a->wf + 1))[4] = codecdata_length;
      memcpy(((char *)(sh_a->wf + 1)) + 10, src, codecdata_length);

      track->realmedia = true;

    } else if (!strcmp(track->codec_id, MKV_A_FLAC)) {
      free(sh_a->wf);
      sh_a->wf = NULL;

      dp = new_demux_packet(4);
      memcpy(dp->buffer, "fLaC", 4);
      dp->pts = 0;
      dp->flags = 0;
      ds_add_packet(demuxer->audio, dp);
      dp = new_demux_packet(track->private_size);
      memcpy(dp->buffer, track->private_data, track->private_size);
      dp->pts = 0;
      dp->flags = 0;
      ds_add_packet(demuxer->audio, dp);
    }

11482:a6b69309a791

      ((short *)(sh_a->wf + 1))[4] = codecdata_length;
      memcpy(((char *)(sh_a->wf + 1)) + 10, src, codecdata_length);

      track->realmedia = true;

    } else if (!strcmp(track->codec_id, MKV_A_FLAC) ||
               (track->a_formattag == 0xf1ac)) {
      free(sh_a->wf);
      sh_a->wf = NULL;

      dp = new_demux_packet(4);
      memcpy(dp->buffer, "fLaC", 4);
      dp->pts = 0;
      dp->flags = 0;
      ds_add_packet(demuxer->audio, dp);
      if (track->a_formattag == mmioFOURCC('f', 'L', 'a', 'C')) {
        dp = new_demux_packet(track->private_size);
        memcpy(dp->buffer, track->private_data, track->private_size);
      } else {
        sh_a->format = mmioFOURCC('f', 'L', 'a', 'C');
        dp = new_demux_packet(track->private_size - sizeof(WAVEFORMATEX));
        memcpy(dp->buffer, (unsigned char *)track->private_data +
               sizeof(WAVEFORMATEX), track->private_size -
               sizeof(WAVEFORMATEX));
      }
      dp->pts = 0;
      dp->flags = 0;
      ds_add_packet(demuxer->audio, dp);
    }