summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_str.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_str.c')
-rw-r--r--src/demuxers/demux_str.c93
1 files changed, 26 insertions, 67 deletions
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 90dbf2117..f125f09c5 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
/*
@@ -23,8 +23,6 @@
* and Stuart Caie (kyzer@4u.net)
* This demuxer handles either raw STR files (which are just a concatenation
* of raw compact disc sectors) or STR files with RIFF headers.
- *
- * $Id: demux_str.c,v 1.26 2007/01/19 00:26:40 dgp85 Exp $
*/
/*
@@ -125,10 +123,10 @@
#define LOG
*/
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
#include "bswap.h"
#include "group_games.h"
@@ -202,8 +200,8 @@ static int open_str_file(demux_str_t *this) {
}
/* check for STR with a RIFF header */
- if ((BE_32(&check_bytes[0]) == RIFF_TAG) &&
- (BE_32(&check_bytes[8]) == CDXA_TAG))
+ if ((_X_BE_32(&check_bytes[0]) == RIFF_TAG) &&
+ (_X_BE_32(&check_bytes[8]) == CDXA_TAG))
local_offset = 0x2C;
else
local_offset = 0;
@@ -220,16 +218,16 @@ static int open_str_file(demux_str_t *this) {
check_bytes[local_offset + 0x13]);
/* check for 12-byte sync marker */
- if ((BE_32(&check_bytes[local_offset + 0]) != 0x00FFFFFF) ||
- (BE_32(&check_bytes[local_offset + 4]) != 0xFFFFFFFF) ||
- (BE_32(&check_bytes[local_offset + 8]) != 0xFFFFFF00)) {
+ if ((_X_BE_32(&check_bytes[local_offset + 0]) != 0x00FFFFFF) ||
+ (_X_BE_32(&check_bytes[local_offset + 4]) != 0xFFFFFFFF) ||
+ (_X_BE_32(&check_bytes[local_offset + 8]) != 0xFFFFFF00)) {
lprintf("sector %d sync error\n", sector);
return 0;
}
/* the 32 bits starting at 0x10 and at 0x14 should be the same */
- if (BE_32(&check_bytes[local_offset + 0x10]) !=
- BE_32(&check_bytes[local_offset + 0x14])) {
+ if (_X_BE_32(&check_bytes[local_offset + 0x10]) !=
+ _X_BE_32(&check_bytes[local_offset + 0x14])) {
lprintf("sector %d control bits copy error\n", sector);
return 0;
}
@@ -248,15 +246,15 @@ static int open_str_file(demux_str_t *this) {
case CDXA_TYPE_VIDEO:
/* first time we have seen video/data in this channel? */
if ((!(this->channel_type[channel] & CDXA_TYPE_DATA)) &&
- (LE_32(&check_bytes[local_offset + 0x18]) == STR_MAGIC)) {
+ (_X_LE_32(&check_bytes[local_offset + 0x18]) == STR_MAGIC)) {
/* mark this channel as having video data */
this->channel_type[channel] |= CDXA_TYPE_VIDEO;
this->bih[channel].biWidth =
- LE_16(&check_bytes[local_offset + 0x18 + 0x10]);
+ _X_LE_16(&check_bytes[local_offset + 0x18 + 0x10]);
this->bih[channel].biHeight =
- LE_16(&check_bytes[local_offset + 0x18 + 0x12]);
+ _X_LE_16(&check_bytes[local_offset + 0x18 + 0x12]);
}
break;
@@ -349,12 +347,12 @@ static int demux_str_send_chunk(demux_plugin_t *this_gen) {
case CDXA_TYPE_DATA:
/* video chunk */
- if (LE_32(&sector[0x18]) != STR_MAGIC ||
+ if (_X_LE_32(&sector[0x18]) != STR_MAGIC ||
channel != this->default_video_channel) {
return 0;
}
- frame_number = LE_32(&sector[0x18 + 0x08]);
+ frame_number = _X_LE_32(&sector[0x18 + 0x08]);
buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
buf->pts = frame_number * FRAME_DURATION;
@@ -365,7 +363,7 @@ static int demux_str_send_chunk(demux_plugin_t *this_gen) {
/* first chunk of frame? sync forthcoming audio packets */
/* FIXME */
- /*if (LE_16(&sector[0x18+0x04]) == 0) {
+ /*if (_X_LE_16(&sector[0x18+0x04]) == 0) {
* int i;
* for (i = 0; i < STR_MAX_CHANNELS; i++) this->audio_pts[i] = buf->pts;
*}
@@ -385,7 +383,7 @@ static int demux_str_send_chunk(demux_plugin_t *this_gen) {
/* if the current chunk is 1 less than the chunk count, this is the
* last chunk of the frame */
- if ((LE_16(&sector[0x18+0x04]) + 1) == LE_16(&sector[0x18+0x06]))
+ if ((_X_LE_16(&sector[0x18+0x04]) + 1) == _X_LE_16(&sector[0x18+0x06]))
buf->decoder_flags |= BUF_FLAG_FRAME_END;
buf->type = BUF_VIDEO_PSX_MDEC | channel;
@@ -520,11 +518,6 @@ static int demux_str_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
return this->status;
}
-static void demux_str_dispose (demux_plugin_t *this) {
-
- free(this);
-}
-
static int demux_str_get_status (demux_plugin_t *this_gen) {
demux_str_t *this = (demux_str_t *) this_gen;
@@ -564,7 +557,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->demux_plugin.send_headers = demux_str_send_headers;
this->demux_plugin.send_chunk = demux_str_send_chunk;
this->demux_plugin.seek = demux_str_seek;
- this->demux_plugin.dispose = demux_str_dispose;
+ this->demux_plugin.dispose = default_demux_plugin_dispose;
this->demux_plugin.get_status = demux_str_get_status;
this->demux_plugin.get_stream_length = demux_str_get_stream_length;
this->demux_plugin.get_capabilities = demux_str_get_capabilities;
@@ -575,19 +568,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
switch (stream->content_detection_method) {
- case METHOD_BY_EXTENSION: {
- const char *extensions, *mrl;
-
- mrl = input->get_mrl (input);
- extensions = class_gen->get_extensions (class_gen);
-
- if (!_x_demux_check_extension (mrl, extensions)) {
- free (this);
- return NULL;
- }
- }
- /* falling through is intended */
-
+ case METHOD_BY_MRL:
case METHOD_BY_CONTENT:
case METHOD_EXPLICIT:
@@ -605,39 +586,17 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
return &this->demux_plugin;
}
-static const char *get_description (demux_class_t *this_gen) {
- return "Sony Playstation STR file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
- return "PSX STR";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
- /* also .mov, but we don't want to hijack that extension */
- return "str iki ik2 dps dat xa xa1 xa2 xas xap";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
- return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
- demux_str_class_t *this = (demux_str_class_t *) this_gen;
- free (this);
-}
-
void *demux_str_init_plugin (xine_t *xine, void *data) {
demux_str_class_t *this;
this = xine_xmalloc (sizeof (demux_str_class_t));
this->demux_class.open_plugin = open_plugin;
- this->demux_class.get_description = get_description;
- this->demux_class.get_identifier = get_identifier;
- this->demux_class.get_mimetypes = get_mimetypes;
- this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.description = N_("Sony Playstation STR file demux plugin");
+ this->demux_class.identifier = "PSX STR";
+ this->demux_class.mimetypes = NULL;
+ this->demux_class.extensions = "str iki ik2 dps dat xa xa1 xa2 xas xap";
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 13:08:06 +0000