1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
--- ticodecplugin/ChangeLog
+++ ticodecplugin.new/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-14 Don Darling, Texas Instruments, Inc.
+ * src/{gstticodecplugin_omap3530.cfg,gstticodecs_omap3530.c}:
+ Update OMAP3530 Support to use DVSDK 3.00.00.40.
+
2009-07-28 Brijesh Singh, Texas Instruments, Inc.
* src/{gstticircbuffer.c}:
Fix potential memory leak in circular buffer when accel framecopy flag is
--- ticodecplugin/src/gstticodecplugin_omap3530.cfg
+++ ticodecplugin.new/src/gstticodecplugin_omap3530.cfg
@@ -12,8 +12,6 @@
*
*/
-prog.build.platform = "ti.platforms.evm3530";
-
/* Load the Codec Engine 'Operating System Abstraction Layer' */
var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
@@ -27,31 +25,20 @@ ipc.commType = ipc.COMM_DSPLINK;
/*
* ======== Engine Configuration ========
*/
-var Engine = xdc.useModule('ti.sdo.ce.Engine');
-var encEngine = Engine.createFromServer(
- "encode",
- "./encodeCombo.x64P",
- "ti.sdo.servers.encode"
- );
-var decEngine = Engine.createFromServer(
- "decode",
- "./decodeCombo.x64P",
- "ti.sdo.servers.decode"
+var Engine = xdc.useModule('ti.sdo.ce.Engine');
+var demoEngine = Engine.createFromServer(
+ "codecServer",
+ "./bin/cs.x64P",
+ "ti.sdo.server.cs"
);
-var encpath = "" + java.lang.System.getenv("ENCODE_COMBO");
-if (encpath != "" && encpath != "null") {
- encEngine.server = java.lang.System.getenv("ENCODE_COMBO");
-}
-
-var decpath = "" + java.lang.System.getenv("DECODE_COMBO");
-if (decpath != "" && decpath != "null") {
- decEngine.server = java.lang.System.getenv("DECODE_COMBO");
+var combopath = "" + java.lang.System.getenv("CODEC_SERVER");
+if (combopath != "" && combopath != "null") {
+ demoEngine.server = java.lang.System.getenv("CODEC_SERVER");
}
/* Load support for the DMAI module */
var DMAI = xdc.loadPackage('ti.sdo.dmai');
-/* Load support for user space DMA */
-var SCPY = xdc.useModule("ti.sdo.fc.scpy.SCPY");
-var SDMA = xdc.useModule("ti.sdo.linuxutils.sdma.SDMA");
+var SCPY = xdc.useModule('ti.sdo.fc.scpy.SCPY');
+var SDMA = xdc.useModule('ti.sdo.linuxutils.sdma.SDMA');
--- ticodecplugin/src/gstticodecs_omap3530.c
+++ ticodecplugin.new/src/gstticodecs_omap3530.c
@@ -22,8 +22,7 @@
#include "gstticodecs.h"
/* Declaration of the production engine and decoders shipped with the DVSDK */
-static Char decodeEngine[] = "decode";
-static Char encodeEngine[] = "encode";
+static Char codecServer[] = "codecServer";
/* NULL terminated list of speech decoders in the engine to use in the demo */
GstTICodec gst_ticodec_codecs[] = {
@@ -32,59 +31,55 @@ GstTICodec gst_ticodec_codecs[] = {
{
"AAC Audio Decoder", /* String name of codec used by plugin */
"aachedec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
}, {
"MPEG1L2 Audio Decoder", /* String name of codec used by plugin */
"mp3dec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
}, {
"MPEG1L3 Audio Decoder", /* String name of codec used by plugin */
"mp3dec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
- }, {
- "WMA Audio Decoder", /* String name of codec used by plugin */
- "wmadec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
},
-
+
/* Video Decoders */
{
"H.264 Video Decoder", /* String name of codec used by plugin */
"h264dec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
}, {
"MPEG4 Video Decoder", /* String name of codec used by plugin */
"mpeg4dec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
}, {
"MPEG2 Video Decoder", /* String name of codec used by plugin */
"mpeg2dec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
},
/* Image Decoders */
{
"JPEG Image Decoder", /* String name of codec used by plugin */
"jpegdec", /* String name of codec used by CE */
- decodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
},
/* Video Encoders */
{
"H.264 Video Encoder", /* String name of codec used by plugin */
"h264enc", /* String name of codec used by CE */
- encodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
}, {
"MPEG4 Video Encoder", /* String name of codec used by plugin */
"mpeg4enc", /* String name of codec used by CE */
- encodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
},
/* Image Encoders */
{
"JPEG Image Encoder", /* String name of codec used by plugin */
"jpegenc", /* String name of codec used by CE */
- encodeEngine /* Engine that contains this codec */
+ codecServer /* Engine that contains this codec */
},
{ NULL }
|
