From af0c41e162725b0edcd6c3d066a2dbef05a3b896 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jul 2013 23:54:11 +0200 Subject: Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups. --- demux/aviprint.c | 197 ------------------------------------------------------- 1 file changed, 197 deletions(-) delete mode 100644 demux/aviprint.c (limited to 'demux/aviprint.c') diff --git a/demux/aviprint.c b/demux/aviprint.c deleted file mode 100644 index 5d285c2104..0000000000 --- a/demux/aviprint.c +++ /dev/null @@ -1,197 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include -#include - -#include "config.h" - -// for avi_stream_id(): -#include "stream/stream.h" -#include "demux.h" - -#include "aviheader.h" -#include "ms_hdr.h" -#include "aviprint.h" - -//#include "codec-cfg.h" -//#include "stheader.h" - -void print_avih_flags(MainAVIHeader *h, int verbose_level){ - mp_msg(MSGT_HEADER, verbose_level, "MainAVIHeader.dwFlags: (%"PRId32")%s%s%s%s%s%s\n",h->dwFlags, - (h->dwFlags&AVIF_HASINDEX)?" HAS_INDEX":"", - (h->dwFlags&AVIF_MUSTUSEINDEX)?" MUST_USE_INDEX":"", - (h->dwFlags&AVIF_ISINTERLEAVED)?" IS_INTERLEAVED":"", - (h->dwFlags&AVIF_TRUSTCKTYPE)?" TRUST_CKTYPE":"", - (h->dwFlags&AVIF_WASCAPTUREFILE)?" WAS_CAPTUREFILE":"", - (h->dwFlags&AVIF_COPYRIGHTED)?" COPYRIGHTED":"" - ); -} - -void print_avih(MainAVIHeader *h, int verbose_level){ - mp_msg(MSGT_HEADER, verbose_level, "======= AVI Header =======\n"); - mp_msg(MSGT_HEADER, verbose_level, "us/frame: %"PRId32" (fps=%5.3f)\n",h->dwMicroSecPerFrame,1000000.0f/(float)h->dwMicroSecPerFrame); - mp_msg(MSGT_HEADER, verbose_level, "max bytes/sec: %"PRId32"\n",h->dwMaxBytesPerSec); - mp_msg(MSGT_HEADER, verbose_level, "padding: %"PRId32"\n",h->dwPaddingGranularity); - print_avih_flags(h, verbose_level); - mp_msg(MSGT_HEADER, verbose_level, "frames total: %"PRId32" initial: %"PRId32"\n",h->dwTotalFrames,h->dwInitialFrames); - mp_msg(MSGT_HEADER, verbose_level, "streams: %"PRId32"\n",h->dwStreams); - mp_msg(MSGT_HEADER, verbose_level, "Suggested BufferSize: %"PRId32"\n",h->dwSuggestedBufferSize); - mp_msg(MSGT_HEADER, verbose_level, "Size: %"PRId32" x %"PRId32"\n",h->dwWidth,h->dwHeight); - mp_msg(MSGT_HEADER, verbose_level, "==========================\n"); -} - -void print_strh(AVIStreamHeader *h, int verbose_level){ - mp_msg(MSGT_HEADER, verbose_level, "====== STREAM Header =====\n"); - mp_msg(MSGT_HEADER, verbose_level, "Type: %.4s FCC: %.4s (%X)\n",(char *)&h->fccType,(char *)&h->fccHandler,(unsigned int)h->fccHandler); - mp_msg(MSGT_HEADER, verbose_level, "Flags: %"PRId32"\n",h->dwFlags); - mp_msg(MSGT_HEADER, verbose_level, "Priority: %d Language: %d\n",h->wPriority,h->wLanguage); - mp_msg(MSGT_HEADER, verbose_level, "InitialFrames: %"PRId32"\n",h->dwInitialFrames); - mp_msg(MSGT_HEADER, verbose_level, "Rate: %"PRId32"/%"PRId32" = %5.3f\n",h->dwRate,h->dwScale,(float)h->dwRate/(float)h->dwScale); - mp_msg(MSGT_HEADER, verbose_level, "Start: %"PRId32" Len: %"PRId32"\n",h->dwStart,h->dwLength); - mp_msg(MSGT_HEADER, verbose_level, "Suggested BufferSize: %"PRId32"\n",h->dwSuggestedBufferSize); - mp_msg(MSGT_HEADER, verbose_level, "Quality %"PRId32"\n",h->dwQuality); - mp_msg(MSGT_HEADER, verbose_level, "Sample size: %"PRId32"\n",h->dwSampleSize); - mp_msg(MSGT_HEADER, verbose_level, "==========================\n"); -} - -void print_wave_header(WAVEFORMATEX *h, int verbose_level){ - mp_msg(MSGT_HEADER, verbose_level, "======= WAVE Format =======\n"); - mp_msg(MSGT_HEADER, verbose_level, "Format Tag: %d (0x%X)\n",h->wFormatTag,h->wFormatTag); - mp_msg(MSGT_HEADER, verbose_level, "Channels: %d\n",h->nChannels); - mp_msg(MSGT_HEADER, verbose_level, "Samplerate: %"PRId32"\n",h->nSamplesPerSec); - mp_msg(MSGT_HEADER, verbose_level, "avg byte/sec: %"PRId32"\n",h->nAvgBytesPerSec); - mp_msg(MSGT_HEADER, verbose_level, "Block align: %d\n",h->nBlockAlign); - mp_msg(MSGT_HEADER, verbose_level, "bits/sample: %d\n",h->wBitsPerSample); - mp_msg(MSGT_HEADER, verbose_level, "cbSize: %d\n",h->cbSize); - if(h->wFormatTag==0x55 && h->cbSize>=12){ - MPEGLAYER3WAVEFORMAT* h2=(MPEGLAYER3WAVEFORMAT *)h; - mp_msg(MSGT_HEADER, verbose_level, "mp3.wID=%d\n",h2->wID); - mp_msg(MSGT_HEADER, verbose_level, "mp3.fdwFlags=0x%"PRIX32"\n",h2->fdwFlags); - mp_msg(MSGT_HEADER, verbose_level, "mp3.nBlockSize=%d\n",h2->nBlockSize); - mp_msg(MSGT_HEADER, verbose_level, "mp3.nFramesPerBlock=%d\n",h2->nFramesPerBlock); - mp_msg(MSGT_HEADER, verbose_level, "mp3.nCodecDelay=%d\n",h2->nCodecDelay); - } - else if (h->wFormatTag == 0xfffe && h->cbSize >= 22) { - WAVEFORMATEXTENSIBLE *h2 = (WAVEFORMATEXTENSIBLE *)h; - mp_msg(MSGT_HEADER, verbose_level, "ex.wValidBitsPerSample=%d\n", h2->wValidBitsPerSample); - mp_msg(MSGT_HEADER, verbose_level, "ex.dwChannelMask=0x%X\n", h2->dwChannelMask); - mp_msg(MSGT_HEADER, verbose_level, "ex.SubFormat=%d (0x%X)\n", h2->SubFormat, h2->SubFormat); - } - else if (h->cbSize > 0) - { - int i; - uint8_t* p = (uint8_t*)(h + 1); - mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); - for (i = 0; i < h->cbSize; i++) - mp_msg(MSGT_HEADER, verbose_level, "[%x] ", p[i]); - mp_msg(MSGT_HEADER, verbose_level, "\n"); - } - mp_msg(MSGT_HEADER, verbose_level, "==========================================================================\n"); -} - - -void print_video_header(BITMAPINFOHEADER *h, int verbose_level){ - mp_msg(MSGT_HEADER, verbose_level, "======= VIDEO Format ======\n"); - mp_msg(MSGT_HEADER, verbose_level, " biSize %d\n", h->biSize); - mp_msg(MSGT_HEADER, verbose_level, " biWidth %d\n", h->biWidth); - mp_msg(MSGT_HEADER, verbose_level, " biHeight %d\n", h->biHeight); - mp_msg(MSGT_HEADER, verbose_level, " biPlanes %d\n", h->biPlanes); - mp_msg(MSGT_HEADER, verbose_level, " biBitCount %d\n", h->biBitCount); - mp_msg(MSGT_HEADER, verbose_level, " biCompression %d='%.4s'\n", h->biCompression, (char *)&h->biCompression); - mp_msg(MSGT_HEADER, verbose_level, " biSizeImage %d\n", h->biSizeImage); - if (h->biSize > sizeof(*h)) - { - int i; - uint8_t* p = (uint8_t*)(h + 1); - mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); - for (i = 0; i < h->biSize-sizeof(*h); i++) - mp_msg(MSGT_HEADER, verbose_level, "[%x] ", *(p+i)); - mp_msg(MSGT_HEADER, verbose_level, "\n"); - } - mp_msg(MSGT_HEADER, verbose_level, "===========================\n"); -} - -void print_vprp(VideoPropHeader *vprp, int verbose_level){ - int i; - mp_msg(MSGT_HEADER, verbose_level, "======= Video Properties Header =======\n"); - mp_msg(MSGT_HEADER, verbose_level, "Format: %d VideoStandard: %d\n", - vprp->VideoFormatToken,vprp->VideoStandard); - mp_msg(MSGT_HEADER, verbose_level, "VRefresh: %d HTotal: %d VTotal: %d\n", - vprp->dwVerticalRefreshRate, vprp->dwHTotalInT, vprp->dwVTotalInLines); - mp_msg(MSGT_HEADER, verbose_level, "FrameAspect: %d:%d Framewidth: %d Frameheight: %d\n", - vprp->dwFrameAspectRatio >> 16, vprp->dwFrameAspectRatio & 0xffff, - vprp->dwFrameWidthInPixels, vprp->dwFrameHeightInLines); - mp_msg(MSGT_HEADER, verbose_level, "Fields: %d\n", vprp->nbFieldPerFrame); - for (i=0; inbFieldPerFrame; i++) { - VIDEO_FIELD_DESC *vfd = &vprp->FieldInfo[i]; - mp_msg(MSGT_HEADER, verbose_level, " == Field %d description ==\n", i); - mp_msg(MSGT_HEADER, verbose_level, " CompressedBMHeight: %d CompressedBMWidth: %d\n", - vfd->CompressedBMHeight, vfd->CompressedBMWidth); - mp_msg(MSGT_HEADER, verbose_level, " ValidBMHeight: %d ValidBMWidth: %d\n", - vfd->ValidBMHeight, vfd->ValidBMWidth); - mp_msg(MSGT_HEADER, verbose_level, " ValidBMXOffset: %d ValidBMYOffset: %d\n", - vfd->ValidBMXOffset, vfd->ValidBMYOffset); - mp_msg(MSGT_HEADER, verbose_level, " VideoXOffsetInT: %d VideoYValidStartLine: %d\n", - vfd->VideoXOffsetInT, vfd->VideoYValidStartLine); - } - mp_msg(MSGT_HEADER, verbose_level, "=======================================\n"); -} - -void print_index(AVIINDEXENTRY *idx, int idx_size, int verbose_level){ - int i; - unsigned int pos[256]; - unsigned int num[256]; - memset(pos, 0, sizeof(pos)); - memset(num, 0, sizeof(num)); - for(i=0;i255) id=255; - mp_msg(MSGT_HEADER, verbose_level, "%5d: %.4s %4X %016"PRIX64" len:%6"PRId32" pos:%7d->%7.3f %7d->%7.3f\n",i, - (char *)&idx[i].ckid, - (unsigned int)idx[i].dwFlags&0xffff, - (uint64_t)AVI_IDX_OFFSET(&idx[i]), -// idx[i].dwChunkOffset+demuxer->movi_start, - idx[i].dwChunkLength, - pos[id],(float)pos[id]/18747.0f, - num[id],(float)num[id]/23.976f - ); - pos[id]+=idx[i].dwChunkLength; - ++num[id]; - } -} - -void print_avistdindex_chunk(avistdindex_chunk *h, int verbose_level){ - mp_msg (MSGT_HEADER, verbose_level, "====== AVI Standard Index Header ========\n"); - mp_msg (MSGT_HEADER, verbose_level, " FCC (%.4s) dwSize (%d) wLongsPerEntry(%d)\n", h->fcc, h->dwSize, h->wLongsPerEntry); - mp_msg (MSGT_HEADER, verbose_level, " bIndexSubType (%d) bIndexType (%d)\n", h->bIndexSubType, h->bIndexType); - mp_msg (MSGT_HEADER, verbose_level, " nEntriesInUse (%d) dwChunkId (%.4s)\n", h->nEntriesInUse, h->dwChunkId); - mp_msg (MSGT_HEADER, verbose_level, " qwBaseOffset (0x%"PRIX64") dwReserved3 (%d)\n", h->qwBaseOffset, h->dwReserved3); - mp_msg (MSGT_HEADER, verbose_level, "===========================\n"); -} -void print_avisuperindex_chunk(avisuperindex_chunk *h, int verbose_level){ - mp_msg (MSGT_HEADER, verbose_level, "====== AVI Super Index Header ========\n"); - mp_msg (MSGT_HEADER, verbose_level, " FCC (%.4s) dwSize (%d) wLongsPerEntry(%d)\n", h->fcc, h->dwSize, h->wLongsPerEntry); - mp_msg (MSGT_HEADER, verbose_level, " bIndexSubType (%d) bIndexType (%d)\n", h->bIndexSubType, h->bIndexType); - mp_msg (MSGT_HEADER, verbose_level, " nEntriesInUse (%d) dwChunkId (%.4s)\n", h->nEntriesInUse, h->dwChunkId); - mp_msg (MSGT_HEADER, verbose_level, " dwReserved[0] (%d) dwReserved[1] (%d) dwReserved[2] (%d)\n", - h->dwReserved[0], h->dwReserved[1], h->dwReserved[2]); - mp_msg (MSGT_HEADER, verbose_level, "===========================\n"); -} -- cgit v1.2.3