summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dxr3/dxr3_decode_spu.c25
-rw-r--r--src/libspudec/spu.h3
-rw-r--r--src/libspudec/xine_decoder.c15
-rw-r--r--src/xine-engine/buffer.h4
4 files changed, 8 insertions, 39 deletions
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 8021ce84c..a6acc9a93 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_decode_spu.c,v 1.46 2004/04/10 15:29:57 mroi Exp $
+ * $Id: dxr3_decode_spu.c,v 1.47 2004/06/21 16:19:40 mroi Exp $
*/
/* dxr3 spu decoder plugin.
@@ -98,8 +98,6 @@ static void dxr3_spudec_set_button(spu_decoder_t *this_gen, int32_t button, i
/* plugin structures */
typedef struct dxr3_spu_stream_state_s {
- uint32_t stream_filter;
-
int spu_length;
int spu_ctrl;
int spu_end;
@@ -219,10 +217,8 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi
}
pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
- for (i = 0; i < MAX_SPU_STREAMS; i++) {
- this->spu_stream_state[i].stream_filter = 1;
+ for (i = 0; i < MAX_SPU_STREAMS; i++)
this->spu_stream_state[i].spu_length = 0;
- }
this->menu = 0;
this->button_filter = 1;
@@ -270,7 +266,7 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
buf->decoder_info[1] != BUF_SPECIAL_SPU_DVD_SUBTYPE )
return;
- if ( buf->decoder_info[2] == SPU_DVD_SUBTYPE_CLUT ) {
+ if (buf->decoder_info[2] == SPU_DVD_SUBTYPE_CLUT) {
llprintf(LOG_SPU, "BUF_SPU_CLUT\n");
if (buf->content[0] == 0) /* cheap endianess detection */
dxr3_swab_clut((int *)buf->content);
@@ -284,16 +280,7 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
return;
}
- if( buf->decoder_info[2] == SPU_DVD_SUBTYPE_SUBP_CONTROL ) {
- /* FIXME: is BUF_SPU_SUBP_CONTROL used anymore? */
- int i;
- uint32_t *subp_control = (uint32_t *)buf->content;
-
- for (i = 0; i < MAX_SPU_STREAMS; i++)
- this->spu_stream_state[i].stream_filter = subp_control[i];
- return;
- }
- if( buf->decoder_info[2] == SPU_DVD_SUBTYPE_NAV ) {
+ if (buf->decoder_info[2] == SPU_DVD_SUBTYPE_NAV) {
uint8_t *p = buf->content;
llprintf(LOG_BTN, "got NAV packet\n");
@@ -411,10 +398,6 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
llprintf(LOG_SPU, "Dropping SPU channel %d. Preview data\n", stream_id);
return;
}
- if (state->stream_filter == 0) {
- llprintf(LOG_SPU, "Dropping SPU channel %d. Stream filtered\n", stream_id);
- return;
- }
if (this->anamorphic && !this->dxr3_vo->widescreen_enabled &&
this->stream->spu_channel_user == -1 && this->stream->spu_channel_letterbox >= 0) {
/* Use the letterbox version of the subpicture for letterboxed display. */
diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h
index 2edda689b..6da793f1c 100644
--- a/src/libspudec/spu.h
+++ b/src/libspudec/spu.h
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: spu.h,v 1.25 2004/04/09 15:01:47 mroi Exp $
+ * $Id: spu.h,v 1.26 2004/06/21 16:19:41 mroi Exp $
*
* This file was originally part of the OMS program.
*
@@ -91,7 +91,6 @@ typedef struct {
typedef struct spudec_stream_state_s {
spudec_seq_t ra_seq;
- uint32_t stream_filter;
spudec_state_t state;
int64_t vpts;
int64_t pts;
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index 713271d44..5fa10b944 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.106 2004/04/09 15:01:47 mroi Exp $
+ * $Id: xine_decoder.c,v 1.107 2004/06/21 16:19:41 mroi Exp $
*
* stuff needed to turn libspu into a xine decoder plugin
*/
@@ -101,15 +101,6 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
return;
}
- if ( buf->decoder_info[2] == SPU_DVD_SUBTYPE_SUBP_CONTROL ) {
- /* FIXME: I don't think SUBP_CONTROL is used any more */
- int i;
- uint32_t *subp_control = (uint32_t*) buf->content;
- for (i = 0; i < 32; i++) {
- this->spudec_stream_state[i].stream_filter = subp_control[i];
- }
- return;
- }
if ( buf->decoder_info[2] == SPU_DVD_SUBTYPE_NAV ) {
#ifdef LOG_DEBUG
printf("libspudec:got nav packet 1\n");
@@ -129,9 +120,6 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
if (buf->decoder_flags & BUF_FLAG_PREVIEW) /* skip preview data */
return;
- if ( this->spudec_stream_state[stream_id].stream_filter == 0)
- return;
-
if (buf->pts) {
metronom_t *metronom = this->stream->metronom;
int64_t vpts = metronom->got_spu_packet(metronom, buf->pts);
@@ -343,7 +331,6 @@ static spu_decoder_t *open_plugin (spu_decoder_class_t *class_gen, xine_stream_t
this->output_open = 0;
this->last_event_vpts = 0;
for (i=0; i < MAX_STREAMS; i++) {
- this->spudec_stream_state[i].stream_filter = 1; /* So it works with non-navdvd plugins */
this->spudec_stream_state[i].ra_seq.complete = 1;
this->spudec_stream_state[i].overlay_handle = -1;
}
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index fa8f72348..a9239aaea 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.138 2004/06/13 21:28:57 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.139 2004/06/21 16:19:40 mroi Exp $
*
*
* contents:
@@ -442,7 +442,7 @@ struct buf_element_s {
#define SPU_DVD_SUBTYPE_CLUT 1
#define SPU_DVD_SUBTYPE_PACKAGE 2
-#define SPU_DVD_SUBTYPE_SUBP_CONTROL 3
+/* FIXME: number 3 is unused */
#define SPU_DVD_SUBTYPE_NAV 4
/* In a BUF_SPECIAL_SPU_DVB_DESCRIPTOR
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:23:44 +0000