mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 00:02:13 +00:00
fe6c4fcae2
Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace some sizeof(type) by sizeof(*pointer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizoef(type) by sizeof(*ptrvar). Besides being consistent with FFmpeg style, this reduces the size of a patch to rename these types to not conflict with the windows.h definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) by sizeof(*ptrvar) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace several sizeof(WAVEFORMATEX) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace one more instance of sizeof(WAVEFORMATEX); fix compilation. patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid some pointless uses of sizeof() and one related cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge one malloc() + memset() invocation into calloc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(WAVEFORMATEX) occurrences. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(BITMAPINFOHEADER) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
130 lines
3.7 KiB
C
130 lines
3.7 KiB
C
/*
|
|
* 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 "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include "m_option.h"
|
|
|
|
#include "stream/stream.h"
|
|
#include "demuxer.h"
|
|
#include "stheader.h"
|
|
|
|
|
|
static int channels = 2;
|
|
static int samplerate = 44100;
|
|
static int samplesize = 2;
|
|
static int bitrate = 0;
|
|
static int format = 0x1; // Raw PCM
|
|
|
|
const m_option_t demux_rawaudio_opts[] = {
|
|
{ "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
|
|
{ "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
|
|
{ "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
|
|
{ "bitrate", &bitrate, CONF_TYPE_INT,CONF_MIN,0,0, NULL },
|
|
{ "format", &format, CONF_TYPE_INT, CONF_MIN, 0 , 0, NULL },
|
|
{NULL, NULL, 0, 0, 0, 0, NULL}
|
|
};
|
|
|
|
|
|
static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) {
|
|
sh_audio_t* sh_audio;
|
|
WAVEFORMATEX* w;
|
|
|
|
sh_audio = new_sh_audio(demuxer,0);
|
|
sh_audio->wf = w = malloc(sizeof(*w));
|
|
w->wFormatTag = sh_audio->format = format;
|
|
w->nChannels = sh_audio->channels = channels;
|
|
w->nSamplesPerSec = sh_audio->samplerate = samplerate;
|
|
if (bitrate > 999)
|
|
w->nAvgBytesPerSec = bitrate/8;
|
|
else if (bitrate > 0)
|
|
w->nAvgBytesPerSec = bitrate*125;
|
|
else
|
|
w->nAvgBytesPerSec = samplerate*samplesize*channels;
|
|
w->nBlockAlign = channels*samplesize;
|
|
sh_audio->samplesize = samplesize;
|
|
w->wBitsPerSample = 8*samplesize;
|
|
w->cbSize = 0;
|
|
|
|
demuxer->movi_start = demuxer->stream->start_pos;
|
|
demuxer->movi_end = demuxer->stream->end_pos;
|
|
|
|
demuxer->audio->id = 0;
|
|
demuxer->audio->sh = sh_audio;
|
|
sh_audio->ds = demuxer->audio;
|
|
sh_audio->needs_parsing = 1;
|
|
|
|
return demuxer;
|
|
}
|
|
|
|
static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
|
|
sh_audio_t* sh_audio = demuxer->audio->sh;
|
|
int l = sh_audio->wf->nAvgBytesPerSec;
|
|
off_t spos = stream_tell(demuxer->stream);
|
|
demux_packet_t* dp;
|
|
|
|
if(demuxer->stream->eof)
|
|
return 0;
|
|
|
|
dp = new_demux_packet(l);
|
|
dp->pts = (spos - demuxer->movi_start) / (float)(sh_audio->wf->nAvgBytesPerSec);
|
|
dp->pos = (spos - demuxer->movi_start);
|
|
|
|
l = stream_read(demuxer->stream,dp->buffer,l);
|
|
resize_demux_packet(dp, l);
|
|
ds_add_packet(ds,dp);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
|
|
stream_t* s = demuxer->stream;
|
|
sh_audio_t* sh_audio = demuxer->audio->sh;
|
|
off_t base,pos;
|
|
|
|
base = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : stream_tell(s);
|
|
if(flags & SEEK_FACTOR)
|
|
pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs);
|
|
else
|
|
pos = base + (rel_seek_secs*sh_audio->i_bps);
|
|
|
|
pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
|
|
stream_seek(s,pos);
|
|
// printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream));
|
|
}
|
|
|
|
const demuxer_desc_t demuxer_desc_rawaudio = {
|
|
"Raw audio demuxer",
|
|
"rawaudio",
|
|
"rawaudio",
|
|
"?",
|
|
"",
|
|
DEMUXER_TYPE_RAWAUDIO,
|
|
0, // no autodetect
|
|
NULL,
|
|
demux_rawaudio_fill_buffer,
|
|
demux_rawaudio_open,
|
|
NULL,
|
|
demux_rawaudio_seek,
|
|
};
|