summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_pva.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_pva.c')
-rw-r--r--src/demuxers/demux_pva.c79
1 files changed, 19 insertions, 60 deletions
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 55b1f7644..9987da057 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -15,15 +15,13 @@
*
* 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
*/
/*
* TechnoTrend PVA File Demuxer by Mike Melanson (melanson@pcisys.net)
* For more information regarding the PVA file format, refer to this PDF:
* http://www.technotrend.de/download/av_format_v1.pdf
- *
- * $Id: demux_pva.c,v 1.25 2007/01/19 00:26:40 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -41,10 +39,10 @@
/* #define LOG_VERBOSE */
/* #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"
#define PVA_PREAMBLE_SIZE 8
@@ -145,7 +143,7 @@ static int demux_pva_send_chunk(demux_plugin_t *this_gen) {
return this->status;
}
- chunk_size = BE_16(&preamble[6]);
+ chunk_size = _X_BE_16(&preamble[6]);
current_file_pos = this->input->get_current_pos(this->input);
@@ -160,7 +158,7 @@ static int demux_pva_send_chunk(demux_plugin_t *this_gen) {
return this->status;
}
chunk_size -= 4;
- pts = BE_32(&pts_buf[0]);
+ pts = _X_BE_32(&pts_buf[0]);
check_newpts( this, pts, PTS_VIDEO );
} else
pts = 0;
@@ -207,11 +205,11 @@ static int demux_pva_send_chunk(demux_plugin_t *this_gen) {
this->status = DEMUX_FINISHED;
return this->status;
}
- if (BE_32(&preamble[0]) != 0x000001C0) {
+ if (_X_BE_32(&preamble[0]) != 0x000001C0) {
this->status = DEMUX_FINISHED;
return this->status;
}
- chunk_size = BE_16(&preamble[4]);
+ chunk_size = _X_BE_16(&preamble[4]);
/* get next 3 header bytes */
if (this->input->read(this->input, preamble, 3) != 3) {
@@ -234,8 +232,8 @@ static int demux_pva_send_chunk(demux_plugin_t *this_gen) {
}
pts = (int64_t)(preamble[0] & 0x0e) << 29 ;
- pts |= (BE_16(&preamble[1]) & 0xFFFE) << 14;
- pts |= (BE_16(&preamble[3]) & 0xFFFE) >> 1;
+ pts |= (_X_BE_16(&preamble[1]) & 0xFFFE) << 14;
+ pts |= (_X_BE_16(&preamble[3]) & 0xFFFE) >> 1;
header_len -= 5 ;
@@ -398,11 +396,6 @@ static int demux_pva_seek (demux_plugin_t *this_gen,
return this->status;
}
-static void demux_pva_dispose (demux_plugin_t *this) {
-
- free(this);
-}
-
static int demux_pva_get_status (demux_plugin_t *this_gen) {
demux_pva_t *this = (demux_pva_t *) this_gen;
@@ -439,7 +432,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->demux_plugin.send_headers = demux_pva_send_headers;
this->demux_plugin.send_chunk = demux_pva_send_chunk;
this->demux_plugin.seek = demux_pva_seek;
- this->demux_plugin.dispose = demux_pva_dispose;
+ this->demux_plugin.dispose = default_demux_plugin_dispose;
this->demux_plugin.get_status = demux_pva_get_status;
this->demux_plugin.get_stream_length = demux_pva_get_stream_length;
this->demux_plugin.get_capabilities = demux_pva_get_capabilities;
@@ -450,19 +443,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:
@@ -480,39 +461,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 "TechnoTrend PVA demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
- return "TechnoTrend PVA";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
- return "pva";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
- return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
- demux_pva_class_t *this = (demux_pva_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
demux_pva_class_t *this;
this = xine_xmalloc (sizeof (demux_pva_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_("TechnoTrend PVA demux plugin");
+ this->demux_class.identifier = "TechnoTrend PVA";
+ this->demux_class.mimetypes = NULL;
+ this->demux_class.extensions = "pva";
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
@@ -526,6 +485,6 @@ static const demuxer_info_t demux_info_pva = {
const plugin_info_t xine_plugin_info[] EXPORTED = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 26, "pva", XINE_VERSION_CODE, &demux_info_pva, init_plugin },
+ { PLUGIN_DEMUX, 27, "pva", XINE_VERSION_CODE, &demux_info_pva, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 04:09:14 +0000