RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove native nuv demuxer, it only needs more code to achieve the same thing 

as the libavformat demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-03-09 13:11:37 +00:00
parent 591ce556b7
commit 601d694829
4 changed files with 0 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOCS/tech/MAINTAINERS
View File

@ -116,7 +116,6 @@ demuxers:
* demux_rtp* - Ross Finlayson
* demux_mpg and demux_ts - Nico Sabbi
* demux_mpc.c - Reimar Döffinger
* demux_nuv.c - Reimar Döffinger
muxers:
* muxer_lavf.c - Michael Niedermayer

1
Makefile
View File

@ -184,7 +184,6 @@ SRCS_COMMON = asxparser.c \
libmpdemux/demux_mov.c \
libmpdemux/demux_mpg.c \
libmpdemux/demux_nsv.c \
libmpdemux/demux_nuv.c \
libmpdemux/demux_pva.c \
libmpdemux/demux_rawaudio.c \
libmpdemux/demux_rawvideo.c \

461
libmpdemux/demux_nuv.c
View File

@ -1,461 +0,0 @@
/*
* NuppelVideo 0.05 file parser
* for MPlayer
* by Panagiotis Issaris <takis@lumumba.luc.ac.be>
*
* Reworked by alex
*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "nuppelvideo.h"
struct nuv_signature
{
char finfo[12]; /* "NuppelVideo" + \0 */
char version[5]; /* "0.05" + \0 */
};
typedef struct nuv_position_t nuv_position_t;
struct nuv_position_t
{
off_t offset;
float time;
int frame;
nuv_position_t* next;
};
typedef struct nuv_info_t
{
int current_audio_frame;
int current_video_frame;
nuv_position_t *index_list;
nuv_position_t *current_position;
} nuv_priv_t;
/**
* \brief find best matching bitrate (in kbps) out of a table
* \param bitrate bitrate to find best match for
* \return best match from table
*/
static int nearestBitrate(int bitrate) {
const int rates[17] = {8000, 16000, 24000, 32000, 40000, 48000, 56000,
64000, 80000, 96000, 112000, 128000, 160000,
192000, 224000, 256000, 320000};
int i;
for (i = 0; i < 16; i++) {
if ((rates[i] + rates[i + 1]) / 2 > bitrate)
break;
}
return rates[i];
}
/**
* Seek to a position relative to the current position, indicated in time.
*/
static void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags )
{
#define MAX_TIME 1000000
nuv_priv_t* priv = demuxer->priv;
struct rtframeheader rtjpeg_frameheader;
off_t orig_pos;
off_t curr_pos;
float current_time = 0;
float start_time = MAX_TIME;
float target_time = start_time + rel_seek_secs * 1000; /* target_time, start_time are ms, rel_seek_secs s */
orig_pos = stream_tell ( demuxer->stream );
if ( rel_seek_secs > 0 )
{
/* Seeking forward */
while(current_time < target_time )
{
if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
return; /* EOF */
le2me_rtframeheader(&rtjpeg_frameheader);
if ( rtjpeg_frameheader.frametype == 'V' )
{
priv->current_position->next = (nuv_position_t*) malloc ( sizeof ( nuv_position_t ) );
priv->current_position = priv->current_position->next;
priv->current_position->frame = priv->current_video_frame++;
priv->current_position->time = rtjpeg_frameheader.timecode;
priv->current_position->offset = orig_pos;
priv->current_position->next = NULL;
if ( start_time == MAX_TIME )
{
start_time = rtjpeg_frameheader.timecode;
/* Recalculate target time with real start time */
target_time = start_time + rel_seek_secs*1000;
}
current_time = rtjpeg_frameheader.timecode;
curr_pos = stream_tell ( demuxer->stream );
stream_seek ( demuxer->stream, curr_pos + rtjpeg_frameheader.packetlength );
/* Adjust current sequence pointer */
}
else if ( rtjpeg_frameheader.frametype == 'A' )
{
if ( start_time == MAX_TIME )
{
start_time = rtjpeg_frameheader.timecode;
/* Recalculate target time with real start time */
target_time = start_time + rel_seek_secs * 1000;
}
current_time = rtjpeg_frameheader.timecode;
curr_pos = stream_tell ( demuxer->stream );
stream_seek ( demuxer->stream, curr_pos + rtjpeg_frameheader.packetlength );
}
}
}
else
{
/* Seeking backward */
nuv_position_t* p;
start_time = priv->current_position->time;
/* Recalculate target time with real start time */
target_time = start_time + rel_seek_secs * 1000;
if(target_time < 0)
target_time = 0;
// Search the target time in the index list, get the offset
// and go to that offset.
p = priv->index_list;
while ( ( p->next != NULL ) && ( p->time < target_time ) )
{
p = p->next;
}
stream_seek ( demuxer->stream, p->offset );
priv->current_video_frame = p->frame;
}
}
static int demux_nuv_fill_buffer ( demuxer_t *demuxer, demux_stream_t *ds )
{
struct rtframeheader rtjpeg_frameheader;
off_t orig_pos;
nuv_priv_t* priv = demuxer->priv;
int want_audio = (demuxer->audio)&&(demuxer->audio->id!=-2);
demuxer->filepos = orig_pos = stream_tell ( demuxer->stream );
if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
return 0; /* EOF */
le2me_rtframeheader(&rtjpeg_frameheader);
#if 0
printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n",
rtjpeg_frameheader.frametype, rtjpeg_frameheader.comptype,
rtjpeg_frameheader.packetlength);
#endif
/* Skip Seekpoint, Extended header and Sync for now */
if ((rtjpeg_frameheader.frametype == 'R') ||
(rtjpeg_frameheader.frametype == 'X') ||
(rtjpeg_frameheader.frametype == 'S'))
return 1;
/* Skip seektable and text (these have a payload) */
if ((rtjpeg_frameheader.frametype == 'Q') ||
(rtjpeg_frameheader.frametype == 'T')) {
stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength);
return 1;
}
if (((rtjpeg_frameheader.frametype == 'D') &&
(rtjpeg_frameheader.comptype == 'R')) ||
(rtjpeg_frameheader.frametype == 'V'))
{
if ( rtjpeg_frameheader.frametype == 'V' )
{
priv->current_video_frame++;
priv->current_position->next = (nuv_position_t*) malloc(sizeof(nuv_position_t));
priv->current_position = priv->current_position->next;
priv->current_position->frame = priv->current_video_frame;
priv->current_position->time = rtjpeg_frameheader.timecode;
priv->current_position->offset = orig_pos;
priv->current_position->next = NULL;
}
/* put RTjpeg tables, Video info to video buffer */
stream_seek ( demuxer->stream, orig_pos );
ds_read_packet ( demuxer->video, demuxer->stream, rtjpeg_frameheader.packetlength + 12,
rtjpeg_frameheader.timecode*0.001, orig_pos, 0 );
} else
if (demuxer->audio && (rtjpeg_frameheader.frametype == 'A'))
{
priv->current_audio_frame++;
if (want_audio) {
/* put Audio to audio buffer */
ds_read_packet ( demuxer->audio, demuxer->stream,
rtjpeg_frameheader.packetlength,
rtjpeg_frameheader.timecode*0.001,
orig_pos + 12, 0 );
} else {
/* skip audio block */
stream_skip ( demuxer->stream,
rtjpeg_frameheader.packetlength );
}
}
return 1;
}
/* Scan for the extended data in MythTV nuv streams */
static int demux_xscan_nuv(demuxer_t* demuxer, int width, int height) {
int i;
off_t orig_pos = stream_tell(demuxer->stream);
struct rtframeheader rtjpeg_frameheader;
struct extendeddata ext;
sh_video_t* sh_video = demuxer->video->sh;
sh_audio_t* sh_audio = demuxer->audio->sh;
for (i = 0; i < 2; ++i) {
if (stream_read(demuxer->stream, (char*)&rtjpeg_frameheader,
sizeof(rtjpeg_frameheader)) < sizeof(rtjpeg_frameheader))
goto out;
le2me_rtframeheader(&rtjpeg_frameheader);
if (rtjpeg_frameheader.frametype != 'X')
stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength);
}
if ( rtjpeg_frameheader.frametype != 'X' )
goto out;
if (rtjpeg_frameheader.packetlength != sizeof(ext)) {
mp_msg(MSGT_DEMUXER, MSGL_WARN,
"NUV extended frame does not have expected length, ignoring\n");
goto out;
}
if (stream_read(demuxer->stream, (char*)&ext, sizeof(ext)) < sizeof(ext))
goto out;
le2me_extendeddata(&ext);
if (ext.version != 1) {
mp_msg(MSGT_DEMUXER, MSGL_WARN,
"NUV extended frame has unknown version number (%d), ignoring\n",
ext.version);
goto out;
}
mp_msg(MSGT_DEMUXER, MSGL_V, "Detected MythTV stream\n");
/* Video parameters */
mp_msg(MSGT_DEMUXER, MSGL_V, "FOURCC: %c%c%c%c\n",
(ext.video_fourcc >> 24) & 0xff,
(ext.video_fourcc >> 16) & 0xff,
(ext.video_fourcc >> 8) & 0xff,
(ext.video_fourcc) & 0xff);
sh_video->format = ext.video_fourcc;
sh_video->i_bps = ext.lavc_bitrate;
/* Audio parameters */
if (ext.audio_fourcc == mmioFOURCC('L', 'A', 'M', 'E')) {
sh_audio->format = 0x55;
} else if (ext.audio_fourcc == mmioFOURCC('R', 'A', 'W', 'A')) {
sh_audio->format = 0x1;
} else {
mp_msg(MSGT_DEMUXER, MSGL_WARN,
"Unknown audio format 0x%x\n", ext.audio_fourcc);
}
sh_audio->channels = ext.audio_channels;
sh_audio->samplerate = ext.audio_sample_rate;
sh_audio->i_bps = sh_audio->channels * sh_audio->samplerate *
ext.audio_bits_per_sample;
if (sh_audio->format != 0x1)
sh_audio->i_bps = nearestBitrate(sh_audio->i_bps /
ext.audio_compression_ratio);
sh_audio->wf->wFormatTag = sh_audio->format;
sh_audio->wf->nChannels = sh_audio->channels;
sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps / 8;
sh_audio->wf->nBlockAlign = sh_audio->channels * 2;
sh_audio->wf->wBitsPerSample = ext.audio_bits_per_sample;
sh_audio->wf->cbSize = 0;
mp_msg(MSGT_DEMUXER, MSGL_V,
"channels=%d bitspersample=%d samplerate=%d compression_ratio=%d\n",
ext.audio_channels, ext.audio_bits_per_sample,
ext.audio_sample_rate, ext.audio_compression_ratio);
return 1;
out:
stream_reset(demuxer->stream);
stream_seek(demuxer->stream, orig_pos);
return 0;
}
static demuxer_t* demux_open_nuv ( demuxer_t* demuxer )
{
sh_video_t *sh_video = NULL;
sh_audio_t *sh_audio = NULL;
struct rtfileheader rtjpeg_fileheader;
nuv_priv_t* priv = (nuv_priv_t*) malloc ( sizeof ( nuv_priv_t) );
demuxer->priv = priv;
priv->current_audio_frame = 0;
priv->current_video_frame = 0;
/* Go to the start */
stream_reset(demuxer->stream);
stream_seek(demuxer->stream, 0);
stream_read ( demuxer->stream, (char*)& rtjpeg_fileheader, sizeof(rtjpeg_fileheader) );
le2me_rtfileheader(&rtjpeg_fileheader);
/* no video */
if (rtjpeg_fileheader.videoblocks == 0)
{
mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_MPDEMUX_NUV_NoVideoBlocksInFile);
return NULL;
}
/* Create a new video stream header */
sh_video = new_sh_video ( demuxer, 0 );
/* Make sure the demuxer knows about the new video stream header
* (even though new_sh_video() ought to take care of it)
*/
demuxer->video->sh = sh_video;
/* Make sure that the video demuxer stream header knows about its
* parent video demuxer stream (this is getting wacky), or else
* video_read_properties() will choke
*/
sh_video->ds = demuxer->video;
/* Custom fourcc for internal MPlayer use */
sh_video->format = mmioFOURCC('N', 'U', 'V', '1');
sh_video->disp_w = rtjpeg_fileheader.width;
sh_video->disp_h = rtjpeg_fileheader.height;
/* NuppelVideo uses pixel aspect ratio
here display aspect ratio is used.
For the moment NuppelVideo only supports 1.0 thus
1.33 == 4:3 aspect ratio.
*/
if(rtjpeg_fileheader.aspect == 1.0)
sh_video->aspect = (float) 4.0f/3.0f;
/* Get the FPS */
sh_video->fps = rtjpeg_fileheader.fps;
sh_video->frametime = 1 / sh_video->fps;
if (rtjpeg_fileheader.audioblocks != 0)
{
sh_audio = new_sh_audio(demuxer, 0);
demuxer->audio->id = 0;
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
sh_audio->format = 0x1;
sh_audio->channels = 2;
sh_audio->samplerate = 44100;
sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
sh_audio->wf->wFormatTag = sh_audio->format;
sh_audio->wf->nChannels = sh_audio->channels;
sh_audio->wf->wBitsPerSample = 16;
sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels*
sh_audio->wf->wBitsPerSample*sh_audio->wf->nSamplesPerSec/8;
sh_audio->wf->nBlockAlign = sh_audio->channels * 2;
sh_audio->wf->cbSize = 0;
}
/* Check for extended data (X frame) and read settings from it */
if (!demux_xscan_nuv(demuxer, rtjpeg_fileheader.width,
rtjpeg_fileheader.height))
/* Otherwise assume defaults */
mp_msg(MSGT_DEMUXER, MSGL_V, "No NUV extended frame, using defaults\n");
priv->index_list = (nuv_position_t*) malloc(sizeof(nuv_position_t));
priv->index_list->frame = 0;
priv->index_list->time = 0;
priv->index_list->offset = stream_tell ( demuxer->stream );
priv->index_list->next = NULL;
priv->current_position = priv->index_list;
return demuxer;
}
static int nuv_check_file ( demuxer_t* demuxer )
{
struct nuv_signature ns;
/* Store original position */
off_t orig_pos = stream_tell(demuxer->stream);
mp_msg ( MSGT_DEMUX, MSGL_V, "Checking for NuppelVideo\n" );
if(stream_read(demuxer->stream,(char*)&ns,sizeof(ns)) != sizeof(ns))
return 0;
if ( strncmp ( ns.finfo, "NuppelVideo", 12 ) &&
strncmp ( ns.finfo, "MythTVVideo", 12 ) )
return 0; /* Not a NuppelVideo file */
if ( strncmp ( ns.version, "0.05", 5 ) &&
strncmp ( ns.version, "0.06", 5 ) &&
strncmp ( ns.version, "0.07", 5 ) )
return 0; /* Wrong version NuppelVideo file */
/* Return to original position */
stream_seek ( demuxer->stream, orig_pos );
return DEMUXER_TYPE_NUV;
}
static void demux_close_nuv(demuxer_t* demuxer) {
nuv_priv_t* priv = demuxer->priv;
nuv_position_t* pos;
if(!priv)
return;
for(pos = priv->index_list ; pos != NULL ; ) {
nuv_position_t* p = pos;
pos = pos->next;
free(p);
}
free(priv);
}
const demuxer_desc_t demuxer_desc_nuv = {
"NuppelVideo demuxer",
"nuv",
"NuppelVideo",
"Panagiotis Issaris",
"",
DEMUXER_TYPE_NUV,
1, // safe autodetect
nuv_check_file,
demux_nuv_fill_buffer,
demux_open_nuv,
demux_close_nuv,
demux_seek_nuv,
NULL
};

2
libmpdemux/demuxer.c
View File

@ -45,7 +45,6 @@ extern const demuxer_desc_t demuxer_desc_mf;
extern const demuxer_desc_t demuxer_desc_avi;
extern const demuxer_desc_t demuxer_desc_y4m;
extern const demuxer_desc_t demuxer_desc_asf;
extern const demuxer_desc_t demuxer_desc_nuv;
extern const demuxer_desc_t demuxer_desc_real;
extern const demuxer_desc_t demuxer_desc_smjpeg;
extern const demuxer_desc_t demuxer_desc_matroska;
@ -100,7 +99,6 @@ const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_y4m,
&demuxer_desc_asf,
&demuxer_desc_nsv,
&demuxer_desc_nuv,
&demuxer_desc_real,
&demuxer_desc_smjpeg,
&demuxer_desc_matroska,