diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-27 22:43:20 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-27 22:43:20 +0000 |
commit | bf46a109ede5d25f506cc75ae80fe1acc5b34edd (patch) | |
tree | a2cd8454df8950c0ab1ced5add63f293ea35d242 /libmpcodecs | |
parent | bc9afe8d39c9e12596677be1141f8098fec73db6 (diff) | |
download | mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.bz2 mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.xz |
the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ve_divx4.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ve_lavc.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ve_libdv.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ve_qtvideo.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ve_rawrgb.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ve_vfw.c | 11 | ||||
-rw-r--r-- | libmpcodecs/ve_xvid.c | 8 |
7 files changed, 30 insertions, 29 deletions
diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index d18713d461..5ef26068cb 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -13,7 +13,7 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" @@ -44,7 +44,7 @@ static int pass; extern char* passtmpfile; -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); #include <encore2.h> @@ -96,7 +96,7 @@ struct config divx4opts_conf[]={ }; struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; ENC_RESULT enc_result; ENC_FRAME enc_frame; void* enc_handle; @@ -289,7 +289,7 @@ static int vf_open(vf_instance_t *vf, char* args){ #endif vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 30c22b5ef3..b064a777e5 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -20,14 +20,14 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" extern char* passtmpfile; -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); //===========================================================================// @@ -175,7 +175,7 @@ struct config lavcopts_conf[]={ #endif struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; AVCodecContext *context; AVFrame *pic; AVCodec *codec; @@ -531,7 +531,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; /* XXX: hack: some of the MJPEG decoder DLL's needs exported huffman table, so we define a zero-table, also lavc mjpeg encoder is putting diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index 221a0354c7..511c059556 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -15,7 +15,7 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" @@ -23,7 +23,7 @@ #include <libdv/dv.h> -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); #ifndef DV_WIDTH #define DV_WIDTH 720 @@ -32,7 +32,7 @@ extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags #endif struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; dv_encoder_t* enc; }; @@ -91,7 +91,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; vf->priv->enc=dv_encoder_new(1,1,1); // FIXME, parse some options! if(!vf->priv->enc) return 0; diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index 4c9c2f0573..e8d292fa79 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -21,7 +21,7 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" @@ -86,7 +86,7 @@ static long (*CountComponents)(ComponentDescription* desc); static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3); -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); //static int format=mmioFOURCC('S','V','Q','1'); @@ -111,7 +111,7 @@ static ImageSequence seq; struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; //dv_encoder_t* enc; }; @@ -279,7 +279,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)+MAX_IDSIZE); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER)+MAX_IDSIZE; diff --git a/libmpcodecs/ve_rawrgb.c b/libmpcodecs/ve_rawrgb.c index 55e119fdf7..2388db5f28 100644 --- a/libmpcodecs/ve_rawrgb.c +++ b/libmpcodecs/ve_rawrgb.c @@ -10,18 +10,18 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); //===========================================================================// struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; }; #define mux_v (vf->priv->mux) @@ -61,7 +61,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 868fb6a385..c1a86da16e 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -2,6 +2,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <inttypes.h> #include "../config.h" #ifdef USE_WIN32DLL @@ -18,13 +19,13 @@ #include "wine/vfw.h" #include "wine/avifmt.h" -#include "aviwrite.h" - #include "img_format.h" #include "mp_image.h" #include "vf.h" -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +#include "muxer.h" + +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); //===========================================================================// @@ -38,7 +39,7 @@ struct config vfwopts_conf[]={ }; struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; BITMAPINFOHEADER* bih; }; @@ -256,7 +257,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; vfw_bih=malloc(sizeof(BITMAPINFOHEADER)); vfw_bih->biSize=sizeof(BITMAPINFOHEADER); diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index 460be88c1c..12f1b64bbc 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -13,7 +13,7 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" @@ -65,7 +65,7 @@ static int const motion_presets[7] = { }; extern char* passtmpfile; -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); static int xvidenc_pass = 0; static int xvidenc_quality = 4; @@ -132,7 +132,7 @@ struct config xvidencopts_conf[] = { }; struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; XVID_ENC_FRAME enc_frame; void* enc_handle; vbr_control_t vbr_state; @@ -487,7 +487,7 @@ vf_open(vf_instance_t *vf, char* args) vf->put_image = put_image; vf->priv = malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); - vf->priv->mux = (aviwrite_stream_t*)args; + vf->priv->mux = (muxer_stream_t*)args; vf->priv->mux->bih = malloc(sizeof(BITMAPINFOHEADER)); vf->priv->mux->bih->biSize = sizeof(BITMAPINFOHEADER); |