Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/libxinevdec cinepak.c,1.32,1.33 cyuv.c,1.20,1.21 fli.c,1.22,1.23 foovideo.c,1.17,1.18 idcinvideo.c,1.17,1.18 image.c,1.8,1.9 interplayvideo.c,1.6,1.7 msrle.c,1.20,1.21 msvc.c,1.25,1.26 qtrle.c,1.15,1.16 qtrpza.c,1.18,1.19 qtsmc.c,1.18,1.19 rgb.c,1.21,1.22 roqvideo.c,1.22,1.23 svq1.c,1.27,1.28 wc3video.c,1.16,1.17 yuv.c,1.24,1.25
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-11-16 23:34:29
|
Update of /cvsroot/xine/xine-lib/src/libxinevdec
In directory sc8-pr-cvs1:/tmp/cvs-serv30572/src/libxinevdec
Modified Files:
cinepak.c cyuv.c fli.c foovideo.c idcinvideo.c image.c
interplayvideo.c msrle.c msvc.c qtrle.c qtrpza.c qtsmc.c rgb.c
roqvideo.c svq1.c wc3video.c yuv.c
Log Message:
New stream/meta info (safe) stuff.
BIG NOTE: use helpers to access to these informations (get/set/reset):
_x_{stream,meta}_info_{get,set,reset}()
are for internal use, don't use *_public() ones from inside the beast ;-)
Some wrongly names "xine_" fonction renaming.
Index: cinepak.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/cinepak.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cinepak.c 15 Nov 2003 13:01:22 -0000 1.32
+++ cinepak.c 16 Nov 2003 23:33:47 -0000 1.33
@@ -421,7 +421,7 @@
this->decoder_ok = 1;
/* stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Cinepak");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Cinepak");
} else if (this->decoder_ok) {
Index: cyuv.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/cyuv.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cyuv.c 15 Nov 2003 13:01:22 -0000 1.20
+++ cyuv.c 16 Nov 2003 23:33:48 -0000 1.21
@@ -163,7 +163,7 @@
this->skipframes = 0;
this->video_step = buf->decoder_info[1];
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Creative YUV");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Creative YUV");
return;
}
Index: fli.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/fli.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fli.c 15 Nov 2003 13:01:22 -0000 1.22
+++ fli.c 16 Nov 2003 23:33:48 -0000 1.23
@@ -454,7 +454,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "FLI/FLC Video");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "FLI/FLC Video");
return;
} else if (this->decoder_ok) {
Index: foovideo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/foovideo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- foovideo.c 15 Nov 2003 13:01:23 -0000 1.17
+++ foovideo.c 16 Nov 2003 23:33:48 -0000 1.18
@@ -111,7 +111,7 @@
this->size = 0;
/* take this opportunity to load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "foovideo");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "foovideo");
/* do anything else relating to initializing this decoder */
this->current_yuv_byte = 0;
Index: idcinvideo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/idcinvideo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- idcinvideo.c 15 Nov 2003 13:01:23 -0000 1.17
+++ idcinvideo.c 16 Nov 2003 23:33:48 -0000 1.18
@@ -267,7 +267,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Id CIN Video");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Id CIN Video");
return;
} else if (this->decoder_ok) {
Index: image.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/image.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- image.c 15 Nov 2003 13:01:23 -0000 1.8
+++ image.c 16 Nov 2003 23:33:48 -0000 1.9
@@ -266,7 +266,7 @@
*out = le2me_16(*out);
}
}
- xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, img->duration);
+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, img->duration);
img->draw(img, this->stream);
img->free(img);
}
Index: interplayvideo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/interplayvideo.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- interplayvideo.c 15 Nov 2003 13:01:23 -0000 1.6
+++ interplayvideo.c 16 Nov 2003 23:33:48 -0000 1.7
@@ -1177,7 +1177,7 @@
this->current_planes = 1;
/* take this opportunity to load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
"Interplay MVE Video");
this->decoder_ok = 1;
Index: msrle.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/msrle.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- msrle.c 15 Nov 2003 13:01:24 -0000 1.20
+++ msrle.c 16 Nov 2003 23:33:48 -0000 1.21
@@ -227,7 +227,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft RLE");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft RLE");
return;
} else if (this->decoder_ok) {
Index: msvc.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/msvc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- msvc.c 15 Nov 2003 13:01:24 -0000 1.25
+++ msvc.c 16 Nov 2003 23:33:48 -0000 1.26
@@ -256,7 +256,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft Video-1");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft Video-1");
} else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
Index: qtrle.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/qtrle.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qtrle.c 15 Nov 2003 13:01:25 -0000 1.15
+++ qtrle.c 16 Nov 2003 23:33:48 -0000 1.16
@@ -862,7 +862,7 @@
/* load the stream/meta info */
sprintf(codec_name, "%d bpp Quicktime Animation (RLE)", this->depth & 0x1F);
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, codec_name);
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, codec_name);
return;
} else if (this->decoder_ok) {
Index: qtrpza.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/qtrpza.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qtrpza.c 15 Nov 2003 13:01:25 -0000 1.18
+++ qtrpza.c 16 Nov 2003 23:33:48 -0000 1.19
@@ -321,7 +321,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Video (RPZA)");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Video (RPZA)");
return;
} else if (this->decoder_ok) {
Index: qtsmc.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/qtsmc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qtsmc.c 15 Nov 2003 13:01:25 -0000 1.18
+++ qtsmc.c 16 Nov 2003 23:33:48 -0000 1.19
@@ -553,7 +553,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Graphics (SMC)");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Graphics (SMC)");
return;
} else if (this->decoder_ok) {
Index: rgb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/rgb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rgb.c 15 Nov 2003 13:01:26 -0000 1.21
+++ rgb.c 16 Nov 2003 23:33:48 -0000 1.22
@@ -125,7 +125,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw RGB");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw RGB");
return;
} else if (this->decoder_ok) {
Index: roqvideo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/roqvideo.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- roqvideo.c 15 Nov 2003 13:01:26 -0000 1.22
+++ roqvideo.c 16 Nov 2003 23:33:48 -0000 1.23
@@ -427,7 +427,7 @@
memset(this->v[1], 0x80, this->c_size);
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "RoQ VQ Video");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "RoQ VQ Video");
return;
}
Index: svq1.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/svq1.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- svq1.c 15 Nov 2003 13:01:26 -0000 1.27
+++ svq1.c 16 Nov 2003 23:33:48 -0000 1.28
@@ -1340,7 +1340,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Sorenson Video 1");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Sorenson Video 1");
} else if (this->decoder_ok) {
Index: wc3video.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/wc3video.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wc3video.c 15 Nov 2003 13:01:27 -0000 1.16
+++ wc3video.c 16 Nov 2003 23:33:48 -0000 1.17
@@ -387,7 +387,7 @@
this->decoder_ok = 1;
/* load the stream/meta info */
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Wing Commander III Video");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Wing Commander III Video");
return;
} else if (this->decoder_ok) {
Index: yuv.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/yuv.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- yuv.c 15 Nov 2003 13:01:27 -0000 1.24
+++ yuv.c 16 Nov 2003 23:33:48 -0000 1.25
@@ -118,24 +118,24 @@
switch (buf->type) {
case BUF_VIDEO_YV12:
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
break;
case BUF_VIDEO_YVU9:
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9");
break;
case BUF_VIDEO_GREY:
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
break;
case BUF_VIDEO_I420:
- xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
break;
}
- xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
return;
} else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
|