[rygel] core: Pass the items all the way to TranscoderBins
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] core: Pass the items all the way to TranscoderBins
- Date: Wed, 26 Aug 2009 11:45:42 +0000 (UTC)
commit 9aa4f7f033133b3dfaa7f3f81c1f7a99362fb6b8
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Sun Jul 5 16:25:54 2009 +0300
core: Pass the items all the way to TranscoderBins
src/rygel/rygel-l16-transcoder-bin.vala | 6 ++++--
src/rygel/rygel-l16-transcoder.vala | 7 ++++---
src/rygel/rygel-mp2ts-transcoder-bin.vala | 8 +++++---
src/rygel/rygel-mp2ts-transcoder.vala | 7 ++++---
src/rygel/rygel-mp3-transcoder-bin.vala | 6 ++++--
src/rygel/rygel-mp3-transcoder.vala | 8 +++++---
6 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/src/rygel/rygel-l16-transcoder-bin.vala b/src/rygel/rygel-l16-transcoder-bin.vala
index 6d03f29..179aef5 100644
--- a/src/rygel/rygel-l16-transcoder-bin.vala
+++ b/src/rygel/rygel-l16-transcoder-bin.vala
@@ -35,11 +35,13 @@ internal class Rygel.L16TranscoderBin : Gst.Bin {
private dynamic Element audio_enc;
- public L16TranscoderBin (Element src,
+ public L16TranscoderBin (MediaItem item,
+ Element src,
L16Transcoder transcoder) throws Error {
Element decodebin = GstUtils.create_element (DECODEBIN, DECODEBIN);
- this.audio_enc = transcoder.create_encoder (AUDIO_SRC_PAD,
+ this.audio_enc = transcoder.create_encoder (item,
+ AUDIO_SRC_PAD,
AUDIO_SINK_PAD);
this.add_many (src, decodebin, this.audio_enc);
diff --git a/src/rygel/rygel-l16-transcoder.vala b/src/rygel/rygel-l16-transcoder.vala
index 8146a51..baeac4a 100644
--- a/src/rygel/rygel-l16-transcoder.vala
+++ b/src/rygel/rygel-l16-transcoder.vala
@@ -60,7 +60,7 @@ internal class Rygel.L16Transcoder : Rygel.Transcoder {
public override Element create_source (MediaItem item,
Element src)
throws Error {
- return new L16TranscoderBin (src, this);
+ return new L16TranscoderBin (item, src, this);
}
public override DIDLLiteResource? add_resource (DIDLLiteItem didl_item,
@@ -82,8 +82,9 @@ internal class Rygel.L16Transcoder : Rygel.Transcoder {
return resource;
}
- public Element create_encoder (string? src_pad_name,
- string? sink_pad_name)
+ public Element create_encoder (MediaItem item,
+ string? src_pad_name,
+ string? sink_pad_name)
throws Error {
dynamic Element convert1 = GstUtils.create_element (AUDIO_CONVERT,
null);
diff --git a/src/rygel/rygel-mp2ts-transcoder-bin.vala b/src/rygel/rygel-mp2ts-transcoder-bin.vala
index 9e7945d..ca2b81c 100644
--- a/src/rygel/rygel-mp2ts-transcoder-bin.vala
+++ b/src/rygel/rygel-mp2ts-transcoder-bin.vala
@@ -38,14 +38,16 @@ internal class Rygel.MP2TSTranscoderBin : Gst.Bin {
private dynamic Element video_enc;
private dynamic Element muxer;
- public MP2TSTranscoderBin (Element src,
+ public MP2TSTranscoderBin (MediaItem item,
+ Element src,
MP2TSTranscoder transcoder)
throws Error {
Element decodebin = GstUtils.create_element (DECODEBIN, DECODEBIN);
var mp3_transcoder = new MP3Transcoder (MP3Layer.TWO);
- this.audio_enc = mp3_transcoder.create_encoder (null,
+ this.audio_enc = mp3_transcoder.create_encoder (item,
+ null,
AUDIO_ENC_SINK);
- this.video_enc = transcoder.create_encoder (null, VIDEO_ENC_SINK);
+ this.video_enc = transcoder.create_encoder (item, null, VIDEO_ENC_SINK);
this.muxer = GstUtils.create_element (MUXER, MUXER);
this.add_many (src,
diff --git a/src/rygel/rygel-mp2ts-transcoder.vala b/src/rygel/rygel-mp2ts-transcoder.vala
index acb9f7b..9069246 100644
--- a/src/rygel/rygel-mp2ts-transcoder.vala
+++ b/src/rygel/rygel-mp2ts-transcoder.vala
@@ -58,7 +58,7 @@ internal class Rygel.MP2TSTranscoder : Rygel.Transcoder {
public override Element create_source (MediaItem item,
Element src)
throws Error {
- return new MP2TSTranscoderBin (src, this);
+ return new MP2TSTranscoderBin (item, src, this);
}
public override DIDLLiteResource? add_resource (DIDLLiteItem didl_item,
@@ -76,8 +76,9 @@ internal class Rygel.MP2TSTranscoder : Rygel.Transcoder {
return resource;
}
- public Element create_encoder (string? src_pad_name,
- string? sink_pad_name)
+ public Element create_encoder (MediaItem item,
+ string? src_pad_name,
+ string? sink_pad_name)
throws Error {
var videorate = GstUtils.create_element (VIDEO_RATE, VIDEO_RATE);
var videoscale = GstUtils.create_element (VIDEO_SCALE, VIDEO_SCALE);
diff --git a/src/rygel/rygel-mp3-transcoder-bin.vala b/src/rygel/rygel-mp3-transcoder-bin.vala
index 4477921..59a650d 100644
--- a/src/rygel/rygel-mp3-transcoder-bin.vala
+++ b/src/rygel/rygel-mp3-transcoder-bin.vala
@@ -40,11 +40,13 @@ internal class Rygel.MP3TranscoderBin : Gst.Bin {
private dynamic Element audio_enc;
- public MP3TranscoderBin (Element src,
+ public MP3TranscoderBin (MediaItem item,
+ Element src,
MP3Transcoder transcoder) throws Error {
Element decodebin = GstUtils.create_element (DECODEBIN, DECODEBIN);
- this.audio_enc = transcoder.create_encoder (AUDIO_SRC_PAD,
+ this.audio_enc = transcoder.create_encoder (item,
+ AUDIO_SRC_PAD,
AUDIO_SINK_PAD);
this.add_many (src, decodebin, this.audio_enc);
diff --git a/src/rygel/rygel-mp3-transcoder.vala b/src/rygel/rygel-mp3-transcoder.vala
index a348d3e..e059d76 100644
--- a/src/rygel/rygel-mp3-transcoder.vala
+++ b/src/rygel/rygel-mp3-transcoder.vala
@@ -47,7 +47,7 @@ internal class Rygel.MP3Transcoder : Rygel.Transcoder {
public override Element create_source (MediaItem item,
Element src)
throws Error {
- return new MP3TranscoderBin (src, this);
+ return new MP3TranscoderBin (item, src, this);
}
public override DIDLLiteResource? add_resource (DIDLLiteItem didl_item,
@@ -64,11 +64,13 @@ internal class Rygel.MP3Transcoder : Rygel.Transcoder {
return resource;
}
- public Element create_encoder (string? src_pad_name,
- string? sink_pad_name)
+ public Element create_encoder (MediaItem item,
+ string? src_pad_name,
+ string? sink_pad_name)
throws Error {
var l16_transcoder = new L16Transcoder (Endianness.LITTLE);
dynamic Element convert = l16_transcoder.create_encoder (
+ item,
null,
CONVERT_SINK_PAD);
dynamic Element encoder = GstUtils.create_element (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]