1
=== added file '.gitignore'
2
--- .gitignore	1970-01-01 00:00:00 +0000
3
+++ .gitignore	2016-02-25 12:47:02 +0000
4
@@ -0,0 +1,1 @@
5
1
build*/
6
0
2
7
=== modified file 'CMakeLists.txt'
8
--- CMakeLists.txt	2016-01-12 06:54:24 +0000
9
+++ CMakeLists.txt	2016-02-25 12:47:02 +0000
10
@@ -54,7 +54,7 @@
11
54
54
12
55
include(cmake/FindReadline.cmake)
55
include(cmake/FindReadline.cmake)
13
56
56
15
57
find_package(Boost COMPONENTS filesystem log system thread)
57
find_package(Boost COMPONENTS filesystem log system thread program_options)
16
58
find_package(PkgConfig)
58
find_package(PkgConfig)
17
59
find_package(Threads)
59
find_package(Threads)
18
60
60
19
@@ -62,7 +62,19 @@
20
62
pkg_check_modules(GIO REQUIRED gio-2.0)
62
pkg_check_modules(GIO REQUIRED gio-2.0)
21
63
pkg_check_modules(GIO-UNIX REQUIRED gio-unix-2.0)
63
pkg_check_modules(GIO-UNIX REQUIRED gio-unix-2.0)
22
64
pkg_check_modules(GST REQUIRED gstreamer-1.0)
64
pkg_check_modules(GST REQUIRED gstreamer-1.0)
23
65
pkg_check_modules(GST_APP REQUIRED gstreamer-app-1.0)
24
65
pkg_check_modules(WDS REQUIRED wds)
66
pkg_check_modules(WDS REQUIRED wds)
25
67
# FIXME for the time being mir is required to do proper hardware
26
68
# encoding on Android platforms. This will be refactored at some
27
69
# point to be abstracted by gstreamer completely or made optional.
28
70
pkg_check_modules(MIRCLIENT REQUIRED mirclient)
29
71
# Same as mentioned above applies for the hybris and android
30
72
# things below.
31
73
pkg_check_modules(HYBRIS_MEDIA REQUIRED libmedia)
32
74
pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
33
75
pkg_check_modules(EGL REQUIRED egl)
34
76
pkg_check_modules(GLESV2 REQUIRED glesv2)
35
77
add_definitions(-DMESA_EGL_NO_X11_HEADERS)
36
66
78
37
67
# Build with system gmock and embedded gtest
79
# Build with system gmock and embedded gtest
38
68
set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
80
set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
39
@@ -78,3 +90,4 @@
40
78
add_subdirectory(conf)
90
add_subdirectory(conf)
41
79
add_subdirectory(src)
91
add_subdirectory(src)
42
80
add_subdirectory(tests)
92
add_subdirectory(tests)
43
93
add_subdirectory(tools)
44
81
94
45
=== added file 'cmake/LinuxCrossCompile.cmake'
46
--- cmake/LinuxCrossCompile.cmake	1970-01-01 00:00:00 +0000
47
+++ cmake/LinuxCrossCompile.cmake	2016-02-25 12:47:02 +0000
48
@@ -0,0 +1,43 @@
49
1
set(CMAKE_SYSTEM_NAME Linux)
50
2
set(CMAKE_SYSTEM_VERSION 1)
51
3
52
4
set(AC_NDK_PATH $ENV{AC_NDK_PATH} CACHE STRING "path of mir android bundle")
53
5
54
6
if (NOT DEFINED AC_TARGET_MACHINE)
55
7
  set(AC_TARGET_MACHINE $ENV{AC_TARGET_MACHINE} CACHE STRING "target machine")
56
8
endif()
57
9
if (NOT DEFINED AC_GCC_VARIANT)
58
10
  set(AC_GCC_VARIANT $ENV{AC_GCC_VARIANT} CACHE STRING "gcc variant required")
59
11
endif()
60
12
61
13
set(CMAKE_C_COMPILER   /usr/bin/${AC_TARGET_MACHINE}-gcc${AC_GCC_VARIANT})
62
14
set(CMAKE_CXX_COMPILER /usr/bin/${AC_TARGET_MACHINE}-g++${AC_GCC_VARIANT})
63
15
64
16
# where to look to find dependencies in the target environment
65
17
set(CMAKE_FIND_ROOT_PATH  "${AC_NDK_PATH}")
66
18
67
19
#treat the chroot's includes as system includes
68
20
include_directories(SYSTEM "${AC_NDK_PATH}/usr/include" "${AC_NDK_PATH}/usr/include/${AC_TARGET_MACHINE}")
69
21
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${AC_NDK_PATH}/usr/include" "${AC_NDK_PATH}/usr/include/${AC_TARGET_MACHINE}" )
70
22
71
23
# Add the chroot libraries as system libraries
72
24
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
73
25
  "${AC_NDK_PATH}/lib"
74
26
  "${AC_NDK_PATH}/lib/${AC_TARGET_MACHINE}"
75
27
  "${AC_NDK_PATH}/usr/lib"
76
28
  "${AC_NDK_PATH}/usr/lib/${AC_TARGET_MACHINE}"
77
29
)
78
30
79
31
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
80
32
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
81
33
set(CMAKE_EXECUTABLE_RUNTIME_C_FLAG "-Wl,-rpath-link,")
82
34
set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG "-Wl,-rpath-link,")
83
35
set(CMAKE_INSTALL_RPATH "${AC_NDK_PATH}/lib:${AC_NDK_PATH}/lib/${AC_TARGET_MACHINE}:${AC_NDK_PATH}/usr/lib:${AC_NDK_PATH}/usr/lib/${AC_TARGET_MACHINE}")
84
36
85
37
set(ENV{PKG_CONFIG_PATH} "${AC_NDK_PATH}/usr/lib/pkgconfig:${AC_NDK_PATH}/usr/lib/${AC_TARGET_MACHINE}/pkgconfig")
86
38
set(ENV{PKG_CONFIG_SYSROOT_DIR} "${AC_NDK_PATH}")
87
39
88
40
#use only the cross compile system
89
41
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
90
42
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
91
43
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
92
0
44
93
=== removed file 'conf/dhcpd.conf'
94
--- conf/dhcpd.conf	2016-01-16 13:02:21 +0000
95
+++ conf/dhcpd.conf	1970-01-01 00:00:00 +0000
96
@@ -1,5 +0,0 @@
97
1
subnet 192.168.7.0 netmask 255.255.255.0 {
98
2
    range 192.168.7.5 192.168.7.10;
99
3
    option subnet-mask 255.255.255.0;
100
4
    option broadcast-address 192.168.7.255;
101
5
}
102
6
0
103
=== added file 'cross-compile-chroot.sh'
104
--- cross-compile-chroot.sh	1970-01-01 00:00:00 +0000
105
+++ cross-compile-chroot.sh	2016-02-25 12:47:02 +0000
106
@@ -0,0 +1,163 @@
107
1
#!/bin/bash
108
2
# build script to compile Aethercast for armhf devices
109
3
#
110
4
set -e
111
5
112
6
usage() {
113
7
  echo "usage: $(basename $0) [-a <arch>] [-c] [-h] [-d <dist>] [-u]"
114
8
  echo "  -a <arch>  Specify target architecture (armhf/arm64/powerpc/ppc64el/amd64/i386/host)"
115
9
  echo "  -c         Clean before building"
116
10
  echo "  -d <dist>  Select the distribution to build for (vivid/wily/xenial)"
117
11
  echo "  -h         This message"
118
12
  echo "  -u         Update partial chroot directory"
119
13
}
120
14
121
15
clean_build_dir() {
122
16
    rm -rf ${1}
123
17
    mkdir ${1}
124
18
}
125
19
126
20
# Default to a dist-agnostic directory name so as to not break Jenkins right now
127
21
BUILD_DIR=build-android-arm
128
22
NUM_JOBS=$(( $(grep -c ^processor /proc/cpuinfo) + 1 ))
129
23
_do_update_chroot=0
130
24
131
25
# Default to vivid as we don't seem to have any working wily devices right now 
132
26
dist=vivid
133
27
clean=0
134
28
update_build_dir=0
135
29
136
30
target_arch=armhf
137
31
138
32
while getopts "a:cd:hu" OPTNAME
139
33
do
140
34
    case $OPTNAME in
141
35
      a )
142
36
        target_arch=${OPTARG}
143
37
        update_build_dir=1
144
38
        ;;
145
39
      c )
146
40
        clean=1
147
41
        ;;
148
42
      d )
149
43
        dist=${OPTARG}
150
44
        update_build_dir=1
151
45
        ;;
152
46
      u )
153
47
        _do_update_chroot=1
154
48
        ;;
155
49
      h )
156
50
        usage
157
51
        exit 0
158
52
        ;;
159
53
      : )
160
54
        echo "Parameter -${OPTARG} needs an argument"
161
55
        usage
162
56
        exit 1;
163
57
        ;;
164
58
      * )
165
59
        echo "invalid option specified"
166
60
        usage
167
61
        exit 1
168
62
        ;;
169
63
    esac
170
64
done
171
65
172
66
shift $((${OPTIND}-1))
173
67
174
68
if [ "${target_arch}" = "host" ]; then
175
69
    target_arch=`dpkg-architecture -qDEB_HOST_ARCH`
176
70
fi
177
71
178
72
if [ ${clean} -ne 0 ]; then
179
73
    clean_build_dir ${BUILD_DIR}
180
74
fi
181
75
182
76
if [ ${update_build_dir} -eq 1 ]; then
183
77
    BUILD_DIR=build-${target_arch}-${dist}
184
78
fi
185
79
186
80
if [ "${AC_NDK_PATH}" = "" ]; then
187
81
    export AC_NDK_PATH=~/.cache/aethercast-${target_arch}-chroot-${dist}
188
82
fi
189
83
190
84
if [ ! -d ${AC_NDK_PATH} ]; then 
191
85
    echo "no partial chroot dir detected. attempting to create one"
192
86
    _do_update_chroot=1
193
87
fi
194
88
195
89
if [ ! -d ${BUILD_DIR} ]; then 
196
90
    mkdir ${BUILD_DIR}
197
91
fi
198
92
199
93
echo "Building for distro: $dist"
200
94
echo "Using AC_NDK_PATH: ${AC_NDK_PATH}"
201
95
202
96
additional_repositories=
203
97
if [ ${dist} == "vivid" ] ; then
204
98
    additional_repositories="-r http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu -r http://ppa.launchpad.net/ci-train-ppa-service/landing-000/ubuntu"
205
99
fi
206
100
207
101
gcc_variant=
208
102
if [ "${dist}" = "vivid" ]; then
209
103
    gcc_variant=-4.9
210
104
fi
211
105
212
106
case ${target_arch} in
213
107
    armhf )
214
108
        target_machine=arm-linux-gnueabihf
215
109
        ;;
216
110
    amd64 )
217
111
        target_machine=x86_64-linux-gnu
218
112
        ;;
219
113
    i386 )
220
114
        target_machine=i386-linux-gnu
221
115
        ;;
222
116
    arm64 )
223
117
        target_machine=aarch64-linux-gnu
224
118
        ;;
225
119
    ppc64el )
226
120
        target_machine=powerpc64le-linux-gnu
227
121
        ;;
228
122
    powerpc )
229
123
        target_machine=powerpc-linux-gnu
230
124
        ;;
231
125
    * )
232
126
        # A good guess (assuming you have dpkg-architecture)
233
127
        target_machine=`dpkg-architecture -A${target_arch} -qDEB_HOST_MULTIARCH` || {
234
128
            echo "Unknown architecture ${target_arch}"
235
129
            usage
236
130
            exit 1
237
131
        }
238
132
        ;;
239
133
esac
240
134
241
135
echo "Target architecture: ${target_arch}"
242
136
echo "Target machine: ${target_machine}"
243
137
244
138
if [ ${_do_update_chroot} -eq 1 ] ; then
245
139
    pushd scripts > /dev/null
246
140
        ./setup-partial-armhf-chroot.sh -d ${dist} -a ${target_arch} ${additional_repositories} ${AC_NDK_PATH}
247
141
    popd > /dev/null
248
142
    # force a clean build after an update, since CMake cache maybe out of date
249
143
    clean_build_dir ${BUILD_DIR}
250
144
fi
251
145
252
146
pushd ${BUILD_DIR} > /dev/null
253
147
254
148
    export PKG_CONFIG_PATH="${AC_NDK_PATH}/usr/lib/pkgconfig:${AC_NDK_PATH}/usr/lib/${target_machine}/pkgconfig"
255
149
    export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
256
150
    export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
257
151
    export PKG_CONFIG_SYSROOT_DIR=$AC_NDK_PATH
258
152
    export PKG_CONFIG_EXECUTABLE=`which pkg-config`
259
153
    export AC_TARGET_MACHINE=${target_machine}
260
154
    export AC_GCC_VARIANT=${gcc_variant}
261
155
    echo "Using PKG_CONFIG_PATH: $PKG_CONFIG_PATH"
262
156
    echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
263
157
    cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
264
158
      -DCMAKE_BUILD_TYPE=debug \
265
159
      ..
266
160
267
161
    make -j${NUM_JOBS} $@
268
162
269
163
popd > /dev/null
270
0
164
271
=== added file 'data/fi.w1.wpa_supplicant1.xml'
272
--- data/fi.w1.wpa_supplicant1.xml	1970-01-01 00:00:00 +0000
273
+++ data/fi.w1.wpa_supplicant1.xml	2016-02-25 12:47:02 +0000
274
@@ -0,0 +1,112 @@
275
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
276
2
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
277
3
<node>
278
4
    <interface name="fi.w1.wpa_supplicant1">
279
5
        <method name="CreateInterface">
280
6
            <arg name="args" type="a{sv}" direction="in"/>
281
7
            <arg name="path" type="o" direction="out"/>
282
8
        </method>
283
9
        <signal name="InterfaceAdded">
284
10
            <arg name="path" type="o"/>
285
11
            <arg name="properties" type="a{sv}"/>
286
12
        </signal>
287
13
        <signal name="InterfaceRemoved">
288
14
            <arg name="path" type="o"/>
289
15
        </signal>
290
16
        <property name="Interfaces" type="ao" access="read"/>
291
17
        <property name="Capabilities" type="as" access="read"/>
292
18
        <property name="WFDIEs" type="ay" access="readwrite">
293
19
            <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
294
20
        </property>
295
21
    </interface>
296
22
    <interface name="fi.w1.wpa_supplicant1.Interface">
297
23
        <method name="SendDriverCommand">
298
24
            <arg name="cmd" type="s" direction="in"/>
299
25
        </method>
300
26
        <property name="Capabilities" type="a{sv}" access="read"/>
301
27
        <property name="State" type="s" access="read"/>
302
28
        <property name="Ifname" type="s" access="read"/>
303
29
        <property name="Driver" type="s" access="read"/>
304
30
    </interface>
305
31
    <interface name="fi.w1.wpa_supplicant1.Interface.P2PDevice">
306
32
        <method name="Find">
307
33
            <arg name="args" type="a{sv}" direction="in"/>
308
34
        </method>
309
35
        <method name="StopFind"/>
310
36
        <method name="ExtendedListen">
311
37
            <arg name="args" type="a{sv}" direction="in"/>
312
38
        </method>
313
39
        <method name="Connect">
314
40
            <arg name="args" type="a{sv}" direction="in"/>
315
41
            <arg name="group" type="s" direction="out"/>
316
42
        </method>
317
43
        <method name="Cancel"/>
318
44
        <method name="Disconnect"/>
319
45
        <method name="Flush"/>
320
46
        <signal name="DeviceFound">
321
47
            <arg name="path" type="o"/>
322
48
        </signal>
323
49
        <signal name="DeviceLost">
324
50
            <arg name="path" type="o"/>
325
51
        </signal>
326
52
        <signal name="FindStopped"/>
327
53
        <signal name="GONegotiationSuccess">
328
54
            <arg name="properties" type="a{sv}"/>
329
55
        </signal>
330
56
        <signal name="GONegotiationFailure">
331
57
            <arg name="properties" type="a{sv}"/>
332
58
        </signal>
333
59
        <signal name="GroupStarted">
334
60
            <arg name="properties" type="a{sv}"/>
335
61
        </signal>
336
62
        <signal name="GroupFinished">
337
63
            <arg name="properties" type="a{sv}"/>
338
64
        </signal>
339
65
        <signal name="GroupFormationFailure">
340
66
            <arg name="reason" type="s"/>
341
67
        </signal>
342
68
        <signal name="GONegotiationRequest">
343
69
            <arg name="path" type="o"/>
344
70
            <arg name="dev_passwd_id" type="i"/>
345
71
        </signal>
346
72
        <property name="P2PDeviceConfig" type="a{sv}" access="readwrite"/>
347
73
        <property name="Peers" type="ao" access="read"/>
348
74
    </interface>
349
75
    <interface name="fi.w1.wpa_supplicant1.Peer">
350
76
        <property name="DeviceName" type="s" access="read"/>
351
77
        <property name="Manufacturer" type="s" access="read"/>
352
78
        <property name="ModelName" type="s" access="read"/>
353
79
        <property name="ModelNumber" type="s" access="read"/>
354
80
        <property name="SerialNumber" type="s" access="read"/>
355
81
        <property name="PrimaryDeviceType" type="ay" access="read"/>
356
82
        <property name="config_method" type="q" access="read"/>
357
83
        <property name="level" type="i" access="read"/>
358
84
        <property name="devicecapability" type="y" access="read"/>
359
85
        <property name="groupcapability" type="y" access="read"/>
360
86
        <property name="SecondaryDeviceTypes" type="aay" access="read"/>
361
87
        <property name="VendorExtension" type="aay" access="read"/>
362
88
        <property name="IEs" type="ay" access="read"/>
363
89
        <property name="DeviceAddress" type="ay" access="read">
364
90
            <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
365
91
        </property>
366
92
        <property name="Groups" type="ao" access="read"/>
367
93
    </interface>
368
94
    <interface name="fi.w1.wpa_supplicant1.Group">
369
95
        <property name="Members" type="s" access="read"/>
370
96
        <property name="Group" type="o" access="read"/>
371
97
        <property name="Role" type="s" access="read"/>
372
98
        <property name="SSID" type="ay" access="read"/>
373
99
        <property name="BSSID" type="ay" access="read"/>
374
100
        <property name="Frequency" type="q" access="read"/>
375
101
        <property name="Passphrase" type="s" access="read"/>
376
102
        <property name="PSK" type="ay" access="read"/>
377
103
        <property name="WPSVendorExtensions" type="aay" access="read"/>
378
104
        <signal name="PeerJoined">
379
105
            <arg name="peer" type="o"/>
380
106
        </signal>
381
107
        <signal name="PeerDisconnected">
382
108
            <arg name="peer" type="o"/>
383
109
        </signal>
384
110
    </interface>
385
111
</node>
386
112
387
0
113
388
=== removed file 'data/fi.w1.wpa_supplicant1.xml'
389
--- data/fi.w1.wpa_supplicant1.xml	2016-01-17 18:42:56 +0000
390
+++ data/fi.w1.wpa_supplicant1.xml	1970-01-01 00:00:00 +0000
391
@@ -1,109 +0,0 @@
392
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
393
2
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
394
3
<node>
395
4
    <interface name="fi.w1.wpa_supplicant1">
396
5
        <method name="CreateInterface">
397
6
            <arg name="args" type="a{sv}" direction="in"/>
398
7
            <arg name="path" type="o" direction="out"/>
399
8
        </method>
400
9
        <signal name="InterfaceAdded">
401
10
            <arg name="path" type="o"/>
402
11
            <arg name="properties" type="a{sv}"/>
403
12
        </signal>
404
13
        <signal name="InterfaceRemoved">
405
14
            <arg name="path" type="o"/>
406
15
        </signal>
407
16
        <property name="Interfaces" type="ao" access="read"/>
408
17
        <property name="Capabilities" type="as" access="read"/>
409
18
        <property name="WFDIEs" type="ay" access="readwrite">
410
19
            <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
411
20
        </property>
412
21
    </interface>
413
22
    <interface name="fi.w1.wpa_supplicant1.Interface">
414
23
        <property name="Capabilities" type="a{sv}" access="read"/>
415
24
        <property name="State" type="s" access="read"/>
416
25
        <property name="Ifname" type="s" access="read"/>
417
26
        <property name="Driver" type="s" access="read"/>
418
27
    </interface>
419
28
    <interface name="fi.w1.wpa_supplicant1.Interface.P2PDevice">
420
29
        <method name="Find">
421
30
            <arg name="args" type="a{sv}" direction="in"/>
422
31
        </method>
423
32
        <method name="StopFind"/>
424
33
        <method name="ExtendedListen">
425
34
            <arg name="args" type="a{sv}" direction="in"/>
426
35
        </method>
427
36
        <method name="Connect">
428
37
            <arg name="args" type="a{sv}" direction="in"/>
429
38
            <arg name="group" type="s" direction="out"/>
430
39
        </method>
431
40
        <method name="Cancel"/>
432
41
        <method name="Disconnect"/>
433
42
        <method name="Flush"/>
434
43
        <signal name="DeviceFound">
435
44
            <arg name="path" type="o"/>
436
45
        </signal>
437
46
        <signal name="DeviceLost">
438
47
            <arg name="path" type="o"/>
439
48
        </signal>
440
49
        <signal name="FindStopped"/>
441
50
        <signal name="GONegotiationSuccess">
442
51
            <arg name="properties" type="a{sv}"/>
443
52
        </signal>
444
53
        <signal name="GONegotiationFailure">
445
54
            <arg name="properties" type="a{sv}"/>
446
55
        </signal>
447
56
        <signal name="GroupStarted">
448
57
            <arg name="properties" type="a{sv}"/>
449
58
        </signal>
450
59
        <signal name="GroupFinished">
451
60
            <arg name="properties" type="a{sv}"/>
452
61
        </signal>
453
62
        <signal name="GroupFormationFailure">
454
63
            <arg name="reason" type="s"/>
455
64
        </signal>
456
65
        <signal name="GONegotiationRequest">
457
66
            <arg name="path" type="o"/>
458
67
            <arg name="dev_passwd_id" type="i"/>
459
68
        </signal>
460
69
        <property name="P2PDeviceConfig" type="a{sv}" access="readwrite"/>
461
70
        <property name="Peers" type="ao" access="read"/>
462
71
    </interface>
463
72
    <interface name="fi.w1.wpa_supplicant1.Peer">
464
73
        <property name="DeviceName" type="s" access="read"/>
465
74
        <property name="Manufacturer" type="s" access="read"/>
466
75
        <property name="ModelName" type="s" access="read"/>
467
76
        <property name="ModelNumber" type="s" access="read"/>
468
77
        <property name="SerialNumber" type="s" access="read"/>
469
78
        <property name="PrimaryDeviceType" type="ay" access="read"/>
470
79
        <property name="config_method" type="q" access="read"/>
471
80
        <property name="level" type="i" access="read"/>
472
81
        <property name="devicecapability" type="y" access="read"/>
473
82
        <property name="groupcapability" type="y" access="read"/>
474
83
        <property name="SecondaryDeviceTypes" type="aay" access="read"/>
475
84
        <property name="VendorExtension" type="aay" access="read"/>
476
85
        <property name="IEs" type="ay" access="read"/>
477
86
        <property name="DeviceAddress" type="ay" access="read">
478
87
            <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
479
88
        </property>
480
89
        <property name="Groups" type="ao" access="read"/>
481
90
    </interface>
482
91
    <interface name="fi.w1.wpa_supplicant1.Group">
483
92
        <property name="Members" type="s" access="read"/>
484
93
        <property name="Group" type="o" access="read"/>
485
94
        <property name="Role" type="s" access="read"/>
486
95
        <property name="SSID" type="ay" access="read"/>
487
96
        <property name="BSSID" type="ay" access="read"/>
488
97
        <property name="Frequency" type="q" access="read"/>
489
98
        <property name="Passphrase" type="s" access="read"/>
490
99
        <property name="PSK" type="ay" access="read"/>
491
100
        <property name="WPSVendorExtensions" type="aay" access="read"/>
492
101
        <signal name="PeerJoined">
493
102
            <arg name="peer" type="o"/>
494
103
        </signal>
495
104
        <signal name="PeerDisconnected">
496
105
            <arg name="peer" type="o"/>
497
106
        </signal>
498
107
    </interface>
499
108
</node>
500
109
501
110
0
502
=== modified file 'data/org.aethercast.xml'
503
--- data/org.aethercast.xml	2015-12-10 17:13:50 +0000
504
+++ data/org.aethercast.xml	2016-02-25 12:47:02 +0000
505
@@ -9,6 +9,8 @@
506
9
            <arg name="path" type="o" direction="in"/>
9
            <arg name="path" type="o" direction="in"/>
507
10
        </method>
10
        </method>
508
11
        <method name="Scan"/>
11
        <method name="Scan"/>
509
12
        <!-- FIXME just for demo purposes. Don't use this method. -->
510
13
        <method name="DisconnectAll"/>
511
12
        <property name="State" type="s" access="read"/>
14
        <property name="State" type="s" access="read"/>
512
13
        <property name="Capabilities" type="as" access="read"/>
15
        <property name="Capabilities" type="as" access="read"/>
513
14
        <property name="Scanning" type="b" access="read"/>
16
        <property name="Scanning" type="b" access="read"/>
514
15
17
515
=== added file 'debian/aethercast-tools.install'
516
--- debian/aethercast-tools.install	1970-01-01 00:00:00 +0000
517
+++ debian/aethercast-tools.install	2016-02-25 12:47:02 +0000
518
@@ -0,0 +1,1 @@
519
1
usr/bin/mirscreencast_to_stream
520
0
2
521
=== removed file 'debian/aethercast.install'
522
--- debian/aethercast.install	2016-01-17 14:08:15 +0000
523
+++ debian/aethercast.install	1970-01-01 00:00:00 +0000
524
@@ -1,1 +0,0 @@
525
1
debian/usr.sbin.aethercast /etc/apparmor.d/dhcpd.d/
526
2
0
527
=== modified file 'debian/control'
528
--- debian/control	2016-01-21 11:13:32 +0000
529
+++ debian/control	2016-02-25 12:47:02 +0000
530
@@ -3,24 +3,31 @@
531
3
Priority: optional
3
Priority: optional
532
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
533
5
XSBC-Original-Maintainer: Simon Fels <simon.fels@canonical.com>
5
XSBC-Original-Maintainer: Simon Fels <simon.fels@canonical.com>
535
6
Build-Depends: cmake,
6
Build-Depends: android-headers-19 (>= 23),
536
7
               cmake,
537
7
               debhelper (>= 9),
8
               debhelper (>= 9),
538
9
               dh-apparmor,
539
8
               dbus,
10
               dbus,
540
9
               google-mock,
11
               google-mock,
541
10
               libboost-dev,
12
               libboost-dev,
542
11
               libboost-filesystem-dev,
13
               libboost-filesystem-dev,
543
12
               libboost-log-dev,
14
               libboost-log-dev,
544
13
               libboost-iostreams-dev,
15
               libboost-iostreams-dev,
545
16
               libboost-program-options-dev,
546
14
               libboost-system-dev,
17
               libboost-system-dev,
547
15
# boost log needs exactly one symbol from boost-thread for resolving
18
# boost log needs exactly one symbol from boost-thread for resolving
548
16
# thread-specific storage locations.
19
# thread-specific storage locations.
549
17
               libboost-thread-dev,
20
               libboost-thread-dev,
550
18
               libglib2.0-dev,
21
               libglib2.0-dev,
551
19
               libgstreamer1.0-dev,
22
               libgstreamer1.0-dev,
552
23
               libgstreamer-plugins-base1.0-dev,
553
20
               libgtest-dev,
24
               libgtest-dev,
554
25
               libhybris-dev,
555
26
               libmedia-dev,
556
21
               libreadline-dev,
27
               libreadline-dev,
557
22
               libreadline6-dev,
28
               libreadline6-dev,
559
23
               libwds-dev
29
               libwds-dev,
560
30
               pkg-config
561
24
Standards-Version: 3.9.4
31
Standards-Version: 3.9.4
562
25
Homepage: http://launchpad.net/aethercast
32
Homepage: http://launchpad.net/aethercast
563
26
# If you aren't a member of ~phablet-team but need to upload packaging changes,
33
# If you aren't a member of ~phablet-team but need to upload packaging changes,
564
@@ -29,9 +36,10 @@
565
29
Vcs-Browser: http://bazaar.launchpad.net/aethercast/trunk/files
36
Vcs-Browser: http://bazaar.launchpad.net/aethercast/trunk/files
566
30
37
567
31
Package: aethercast
38
Package: aethercast
569
32
Architecture: any
39
Architecture: i386 amd64 armhf
570
33
Depends: ${misc:Depends},
40
Depends: ${misc:Depends},
571
34
         ${shlibs:Depends},
41
         ${shlibs:Depends},
572
42
         aethercast-tools,
573
35
         isc-dhcp-server,
43
         isc-dhcp-server,
574
36
         isc-dhcp-client,
44
         isc-dhcp-client,
575
37
         wpasupplicant
45
         wpasupplicant
576
@@ -39,3 +47,18 @@
577
39
 A management service for remote displays which it can stream the
47
 A management service for remote displays which it can stream the
578
40
 current screen content to. It will support multiple approaches
48
 current screen content to. It will support multiple approaches
579
41
 for this like Miracast.
49
 for this like Miracast.
580
50
581
51
Package: aethercast-tools
582
52
Architecture: i386 amd64 armhf
583
53
Depends: ${misc:Depends},
584
54
         ${shlibs:Depends},
585
55
         isc-dhcp-server,
586
56
         isc-dhcp-client,
587
57
         wpasupplicant
588
58
Description: Tools for the display casting service
589
59
  A management service for remote displays which it can stream the
590
60
 current screen content to. It will support multiple approaches
591
61
 for this like Miracast.
592
62
 .
593
63
 This package contains small utilities helping to work with the
594
64
 display streaming stack.
595
42
65
596
=== modified file 'debian/rules'
597
--- debian/rules	2016-01-17 14:01:37 +0000
598
+++ debian/rules	2016-02-25 12:47:02 +0000
599
@@ -20,3 +20,7 @@
600
20
20
601
21
override_dh_auto_test:
21
override_dh_auto_test:
602
22
	# disable
22
	# disable
603
23
604
24
override_dh_install:
605
25
	dh_install
606
26
	dh_apparmor -paethercast --profile-name=usr.sbin.dhcpd
607
23
27
608
=== modified file 'debian/usr.sbin.aethercast'
609
--- debian/usr.sbin.aethercast	2016-01-30 12:33:55 +0000
610
+++ debian/usr.sbin.aethercast	2016-02-25 12:47:02 +0000
611
@@ -1,11 +1,15 @@
612
1
# vim:syntax=apparmor
1
# vim:syntax=apparmor
613
2
2
623
3
  # Allow aethercast to start dhcpd with its own configuration
3
# Work around bug:
624
4
  # file it needs to provide DHCP for groups it manages through
4
# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662
625
5
  # WiFi Direct. This need to stay as long as NetworkManager does
5
capability dac_override,
626
6
  # not has support for WiFi Direct and aethercast is using that.
6
627
7
  /etc/aethercast/dhcpd.conf r,
7
# Allow aethercast to start dhcpd with its own configuration
628
8
  # In addition aethercast will also point dhcpd to a private
8
# file it needs to provide DHCP for groups it manages through
629
9
  # lease/pid file
9
# WiFi Direct. This need to stay as long as NetworkManager does
630
10
  /{,var/}run/aethercast/dhcpd*.leases* lrw,
10
# not has support for WiFi Direct and aethercast is using that.
631
11
  /{,var/}run/aethercast/dhcpd*.pid lrw,
11
/etc/aethercast/dhcpd.conf r,
632
12
# In addition aethercast will also point dhcpd to a private
633
13
# lease/pid file
634
14
/{,var/}run/aethercast/dhcpd*.leases lrw,
635
15
/{,var/}run/aethercast/dhcpd*.pid lrw,
636
12
16
637
=== added directory 'scripts'
638
=== added file 'scripts/setup-partial-armhf-chroot.sh'
639
--- scripts/setup-partial-armhf-chroot.sh	1970-01-01 00:00:00 +0000
640
+++ scripts/setup-partial-armhf-chroot.sh	2016-02-25 12:47:02 +0000
641
@@ -0,0 +1,155 @@
642
1
#!/bin/bash
643
2
#
644
3
# TODO: Rename this file without "armhf" when it's safe to do so.
645
4
#
646
5
647
6
set -e
648
7
649
8
name=${0}
650
9
651
10
usage() {
652
11
    echo "Usage: ${name} [options] mychroot-dir"
653
12
    echo "options:"
654
13
    echo "	-a arch	Select architecture, i.e. armhf, arm64, ppc... Default is armhf"
655
14
    echo "	-d dist	Select distribution, i.e. vivid, wily. Default is vivid"
656
15
    echo "	-r rep	Select an additional repository for bootstrap. Default is none"
657
16
    echo
658
17
    echo "please supply at least a directory to create partial chroot in. (eg, ./setup-partial-armhf-chroot.sh mychroot-dir)"
659
18
}
660
19
661
20
# Default to vivid as we don't seem to have any working wily devices right now.
662
21
# Also Jenkins expects this script to default to vivid (TODO: update CI?)
663
22
arch=armhf
664
23
dist=vivid
665
24
sourceid=0
666
25
repositories=
667
26
sources=
668
27
669
28
while getopts a:d:r:h opt; do
670
29
    case $opt in
671
30
        a)
672
31
            arch=$OPTARG
673
32
            ;;
674
33
        d)
675
34
            dist=$OPTARG
676
35
            ;;
677
36
        r)
678
37
            repositories="$repositories $OPTARG"
679
38
            ((++sourceid))
680
39
            sources="$sources source$sourceid"
681
40
            ;;
682
41
        :)
683
42
            echo "Option -$OPTARG requires an argument" 
684
43
            usage
685
44
            exit 1
686
45
            ;;
687
46
        h)
688
47
            usage
689
48
            exit 0
690
49
            ;;
691
50
        \?)
692
51
            echo "Invalid option: -$OPTARG" 
693
52
            usage
694
53
            exit 1
695
54
            ;;
696
55
    esac
697
56
done
698
57
699
58
shift $((OPTIND-1))
700
59
701
60
if [ -z ${1} ]; then
702
61
    usage
703
62
    exit 1
704
63
fi
705
64
706
65
directory=${1}
707
66
echo "creating phablet-compatible $arch partial chroot for aethercast compilation in directory ${directory}"
708
67
709
68
if [ ! -d ${directory} ]; then
710
69
    mkdir -p ${directory} 
711
70
fi
712
71
713
72
DEBCONTROL=$(pwd)/../debian/control
714
73
715
74
pushd ${directory} > /dev/null
716
75
717
76
# Empty dpkg status file, so that ALL dependencies are listed with dpkg-checkbuilddeps
718
77
echo "" > status
719
78
720
79
# Manual error code checking is needed for dpkg-checkbuilddeps
721
80
set +e
722
81
723
82
# Parse dependencies from debian/control
724
83
# dpkg-checkbuilddeps returns non-zero when dependencies are not met and the list is sent to stderr
725
84
builddeps=$(dpkg-checkbuilddeps -a ${arch} --admindir=. ${DEBCONTROL} 2>&1 )
726
85
if [ $? -eq 0 ] ; then
727
86
    exit 0 
728
87
fi
729
88
echo "${builddeps}"
730
89
731
90
# now turn exit on error option
732
91
set -e
733
92
734
93
# Sanitize dependencies list for submission to multistrap
735
94
# build-essential is not needed as we are cross-compiling
736
95
builddeps=$(echo ${builddeps} | sed -e 's/dpkg-checkbuilddeps://g' \
737
96
                                    -e 's/error://g' \
738
97
                                    -e 's/Unmet build dependencies://g' \
739
98
                                    -e 's/build-essential:native//g')
740
99
builddeps=$(echo ${builddeps} | sed 's/([^)]*)//g')
741
100
builddeps=$(echo ${builddeps} | sed -e 's/abi-compliance-checker//g')
742
101
builddeps=$(echo ${builddeps} | sed -e 's/multistrap//g')
743
102
744
103
case ${arch} in
745
104
    amd64 | i386 )
746
105
        source_url=http://archive.ubuntu.com/ubuntu
747
106
        ;;
748
107
    * )
749
108
        source_url=http://ports.ubuntu.com/ubuntu-ports
750
109
        ;;
751
110
esac
752
111
753
112
echo "[General]
754
113
arch=${arch}
755
114
directory=${directory}
756
115
unpack=false
757
116
noauth=true
758
117
bootstrap=Ubuntu ${sources}
759
118
760
119
[Ubuntu]
761
120
packages=${builddeps}
762
121
source=${source_url}
763
122
suite=${dist}
764
123
" > mstrap.conf
765
124
766
125
sourceid=0
767
126
for x in ${repositories};
768
127
do
769
128
    ((++sourceid))
770
129
    echo "[source${sourceid}]
771
130
source=${x}
772
131
suite=${dist}
773
132
" >> mstrap.conf
774
133
done
775
134
776
135
multistrap -f mstrap.conf 
777
136
778
137
rm -f var/cache/apt/archives/lock
779
138
780
139
# Remove libc libraries that confuse the cross-compiler
781
140
rm -f var/cache/apt/archives/libc-dev*.deb
782
141
rm -f var/cache/apt/archives/libc6*.deb
783
142
784
143
for deb in var/cache/apt/archives/* ; do
785
144
    if [ ! -d ${deb} ] ; then
786
145
        echo "unpacking: ${deb}"
787
146
        dpkg -x ${deb} .
788
147
    fi
789
148
done
790
149
791
150
# Fix up symlinks which asssumed the usual root path
792
151
for broken_symlink in $(find . -name \*.so -type l -xtype l) ; do
793
152
    ln -sf $(pwd)$(readlink ${broken_symlink}) ${broken_symlink}
794
153
done
795
154
796
155
popd > /dev/null 
797
0
156
798
=== modified file 'src/CMakeLists.txt'
799
--- src/CMakeLists.txt	2016-01-21 13:25:31 +0000
800
+++ src/CMakeLists.txt	2016-02-25 12:47:02 +0000
801
@@ -27,15 +27,17 @@
802
27
configure_file(w11tng/config.h.in w11tng/config.h @ONLY)
27
configure_file(w11tng/config.h.in w11tng/config.h @ONLY)
803
28
28
804
29
set(HEADERS
29
set(HEADERS
814
30
    mcs/ip_v4_address.h
30
  mcs/ip_v4_address.h
815
31
    mcs/keep_alive.h
31
  mcs/keep_alive.h
816
32
    mcs/mac_address.h
32
  mcs/mac_address.h
817
33
    mcs/types.h
33
  mcs/types.h
818
34
    mcs/shared_gobject.h
34
  mcs/shared_gobject.h
819
35
    mcs/keep_alive.h
35
  mcs/keep_alive.h
820
36
36
  mcs/config.h
821
37
    mcs/config.h
37
822
38
    w11tng/config.h
38
  mcs/gl/common.h
823
39
824
40
  w11tng/config.h
825
39
)
41
)
826
40
42
827
41
set(SOURCES
43
set(SOURCES
828
@@ -43,11 +45,11 @@
829
43
  mcs/networkutils.cpp
45
  mcs/networkutils.cpp
830
44
  mcs/mediamanagerfactory.cpp
46
  mcs/mediamanagerfactory.cpp
831
45
  mcs/basesourcemediamanager.cpp
47
  mcs/basesourcemediamanager.cpp
832
48
  mcs/initgstreameronce.cpp
833
46
  mcs/gstsourcemediamanager.cpp
49
  mcs/gstsourcemediamanager.cpp
834
47
  mcs/testsourcemediamanager.cpp
50
  mcs/testsourcemediamanager.cpp
835
48
  mcs/x11sourcemediamanager.cpp
51
  mcs/x11sourcemediamanager.cpp
836
49
  mcs/logger.cpp
52
  mcs/logger.cpp
837
50
  mcs/mirsourcemediamanager.cpp
838
51
  mcs/forwardingmiracastcontroller.cpp
53
  mcs/forwardingmiracastcontroller.cpp
839
52
  mcs/forwardingnetworkdevice.cpp
54
  mcs/forwardingnetworkdevice.cpp
840
53
  mcs/miracastcontroller.cpp
55
  mcs/miracastcontroller.cpp
841
@@ -58,11 +60,39 @@
842
58
  mcs/networkmanager.cpp
60
  mcs/networkmanager.cpp
843
59
  mcs/networkmanagerfactory.cpp
61
  mcs/networkmanagerfactory.cpp
844
60
  mcs/networkdevice.cpp
62
  mcs/networkdevice.cpp
846
61
63
  mcs/x264.cpp
847
62
  ${CMAKE_CURRENT_BINARY_DIR}/mcs/aethercastinterface.c
64
  ${CMAKE_CURRENT_BINARY_DIR}/mcs/aethercastinterface.c
848
63
  mcs/dbushelpers.cpp
65
  mcs/dbushelpers.cpp
849
64
  mcs/networkdeviceskeleton.cpp
66
  mcs/networkdeviceskeleton.cpp
850
65
67
851
68
  mcs/video/videoformat.cpp
852
69
  mcs/video/buffer.cpp
853
70
  mcs/video/bufferqueue.cpp
854
71
  mcs/video/utils.cpp
855
72
  mcs/video/utils_from_android.cpp
856
73
  mcs/video/baseencoder.cpp
857
74
  mcs/video/h264analyzer.cpp
858
75
  mcs/video/measurepoint.cpp
859
76
  mcs/video/statistics.cpp
860
77
861
78
  mcs/streaming/mpegtspacketizer.cpp
862
79
  mcs/streaming/rtpsender.cpp
863
80
864
81
  mcs/mir/mediasender.cpp
865
82
  mcs/mir/sourcemediamanagernext.cpp
866
83
  mcs/mir/streamconnector.cpp
867
84
  mcs/mir/streamrenderer.cpp
868
85
869
86
  mcs/android/h264encoder.cpp
870
87
871
88
  mcs/systemcontroller.cpp
872
89
873
90
  mcs/ubuntu/powerd.cpp
874
91
  mcs/ubuntu/unity.cpp
875
92
  mcs/ubuntu/systemcontroller.cpp
876
93
  mcs/ubuntu/powerdsystemlock.cpp
877
94
  mcs/ubuntu/unitydisplaylock.cpp
878
95
879
66
  ${CMAKE_CURRENT_BINARY_DIR}/mcs/wpasupplicantinterface.c
96
  ${CMAKE_CURRENT_BINARY_DIR}/mcs/wpasupplicantinterface.c
880
67
  w11tng/networkmanager.cpp
97
  w11tng/networkmanager.cpp
881
68
  w11tng/networkdevice.cpp
98
  w11tng/networkdevice.cpp
882
@@ -83,20 +113,19 @@
883
83
  w11tng/hostname1stub.cpp
113
  w11tng/hostname1stub.cpp
884
84
)
114
)
885
85
115
886
86
link_directories(
887
87
  ${GLIB_LIBRARY_DIRS}
888
88
  ${GIO_LIBRARY_DIRS}
889
89
  ${GIO-UNIX_LIBRARY_DIRS}
890
90
  ${WDS_LIBRARY_DIRS}
891
91
)
892
92
893
93
include_directories(
116
include_directories(
894
94
  ${Boost_INCLUDE_DIRS}
117
  ${Boost_INCLUDE_DIRS}
895
95
  ${GLIB_INCLUDE_DIRS}
118
  ${GLIB_INCLUDE_DIRS}
896
96
  ${GIO_INCLUDE_DIRS}
119
  ${GIO_INCLUDE_DIRS}
897
97
  ${GIO-UNIX_INCLUDE_DIRS}
120
  ${GIO-UNIX_INCLUDE_DIRS}
898
98
  ${GST_INCLUDE_DIRS}
121
  ${GST_INCLUDE_DIRS}
899
122
  ${GST_APP_INCLUDE_DIRS}
900
99
  ${WDS_INCLUDE_DIRS}
123
  ${WDS_INCLUDE_DIRS}
901
124
  ${HYBRIS_MEDIA_INCLDUE_DIRS}
902
125
  ${ANDROID_HEADERS_INCLUDE_DIRS}
903
126
  ${MIRCLIENT_INCLUDE_DIRS}
904
127
  ${EGL_INCLUDE_DIRS}
905
128
  ${GLESV2_INCLUDE_DIRS}
906
100
  ${CMAKE_CURRENT_BINARY_DIR}/src
129
  ${CMAKE_CURRENT_BINARY_DIR}/src
907
101
  ${CMAKE_CURRENT_BINARY_DIR}/src/w11tng
130
  ${CMAKE_CURRENT_BINARY_DIR}/src/w11tng
908
102
)
131
)
909
@@ -106,13 +135,29 @@
910
106
add_executable(aethercast mcs/main.cpp)
135
add_executable(aethercast mcs/main.cpp)
911
107
136
912
108
target_link_libraries(aethercast-core
137
target_link_libraries(aethercast-core
913
138
  ${Boost_LDFLAGS}
914
109
  ${Boost_LIBRARIES}
139
  ${Boost_LIBRARIES}
915
140
  ${GLIB_LDFLAGS}
916
110
  ${GLIB_LIBRARIES}
141
  ${GLIB_LIBRARIES}
917
142
  ${GIO_LDFLAGS}
918
111
  ${GIO_LIBRARIES}
143
  ${GIO_LIBRARIES}
919
144
  ${GIO-UNIX_LDFLAGS}
920
112
  ${GIO-UNIX_LIBRARIES}
145
  ${GIO-UNIX_LIBRARIES}
921
146
  ${GST_LDFLAGS}
922
113
  ${GST_LIBRARIES}
147
  ${GST_LIBRARIES}
923
148
  ${GST_APP_LDFLAGS}
924
149
  ${GST_APP_LIBRARIES}
925
114
  ${CMAKE_THREAD_LIBS_INIT}
150
  ${CMAKE_THREAD_LIBS_INIT}
926
151
  ${WDS_LDFLAGS}
927
115
  ${WDS_LIBRARIES}
152
  ${WDS_LIBRARIES}
928
153
  ${HYBRIS_MEDIA_LDFLAGS}
929
154
  ${HYBRIS_MEDIA_LIBRARIES}
930
155
  ${MIRCLIENT_LDFLAGS}
931
156
  ${MIRCLIENT_LIBRARIES}
932
157
  ${EGL_LDFLAGS}
933
158
  ${EGL_LIBRARIES}
934
159
  ${GLESV2_LDFLAGS}
935
160
  ${GLESV2_LIBRARIES}
936
116
  -ldl
161
  -ldl
937
117
)
162
)
938
118
163
939
119
164
940
=== added directory 'src/mcs/android'
941
=== added file 'src/mcs/android/h264encoder.cpp'
942
--- src/mcs/android/h264encoder.cpp	1970-01-01 00:00:00 +0000
943
+++ src/mcs/android/h264encoder.cpp	2016-02-25 12:47:02 +0000
944
@@ -0,0 +1,464 @@
945
1
/*
946
2
 * Copyright (C) 2016 Canonical, Ltd.
947
3
 *
948
4
 * This program is free software: you can redistribute it and/or modify it
949
5
 * under the terms of the GNU General Public License version 3, as published
950
6
 * by the Free Software Foundation.
951
7
 *
952
8
 * This program is distributed in the hope that it will be useful, but
953
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
954
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
955
11
 * PURPOSE.  See the GNU General Public License for more details.
956
12
 *
957
13
 * You should have received a copy of the GNU General Public License along
958
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
959
15
 *
960
16
 */
961
17
962
18
#include <system/window.h>
963
19
964
20
#include "mcs/logger.h"
965
21
966
22
#include "mcs/video/statistics.h"
967
23
968
24
#include "mcs/android/h264encoder.h"
969
25
970
26
namespace {
971
27
static const char *kEncoderThreadName{"H264Encoder"};
972
28
static const char *kH264MimeType{"video/avc"};
973
29
static const char *kRawMimeType{"video/raw"};
974
30
// From frameworks/native/include/media/openmax/OMX_IVCommon.h
975
31
const int32_t kOMXColorFormatAndroidOpaque = 0x7F000789;
976
32
const int32_t kOMXVideoIntraRefreshCyclic = 0;
977
33
// From frameworks/native/include/media/openmax/OMX_Video.h
978
34
const int32_t kOMXVideoControlRateConstant = 2;
979
35
// From frameworks/native/include/media/hardware/MetadataBufferType.h
980
36
const uint32_t kMetadataBufferTypeGrallocSource = 1;
981
37
// From frameworks/av/include/media/stagefright/MediaErrors.h
982
38
enum AndroidMediaError {
983
39
    kAndroidMediaErrorBase = -1000,
984
40
    kAndroidMediaErrorEndOfStream = kAndroidMediaErrorBase - 11,
985
41
};
986
42
}
987
43
988
44
namespace mcs {
989
45
namespace android {
990
46
991
47
class MediaSourceBuffer : public video::Buffer
992
48
{
993
49
public:
994
50
    typedef std::shared_ptr<MediaSourceBuffer> Ptr;
995
51
996
52
    ~MediaSourceBuffer() {
997
53
        if (!buffer_)
998
54
            return;
999
55
1000
56
        auto ref_count = media_buffer_get_refcount(buffer_);
1001
57
1002
58
        // If someone has set a reference on the buffer we just have to
1003
59
        // release it here and the other one will take care about actually
1004
60
        // destroying it.
1005
61
        if (ref_count > 0)
1006
62
            media_buffer_release(buffer_);
1007
63
        else
1008
64
            media_buffer_destroy(buffer_);
1009
65
1010
66
    }
1011
67
1012
68
    static MediaSourceBuffer::Ptr Create(MediaBufferWrapper *buffer) {
1013
69
        auto sp = std::shared_ptr<MediaSourceBuffer>(new MediaSourceBuffer);
1014
70
        sp->buffer_ = buffer;
1015
71
        sp->ExtractTimestamp();
1016
72
        return sp;
1017
73
    }
1018
74
1019
75
    virtual uint32_t Length() const {
1020
76
        if (!buffer_)
1021
77
            return 0;
1022
78
1023
79
        return media_buffer_get_size(buffer_);
1024
80
    }
1025
81
1026
82
    virtual uint8_t* Data() {
1027
83
        if (!buffer_)
1028
84
            return nullptr;
1029
85
1030
86
        return static_cast<uint8_t*>(media_buffer_get_data(buffer_));
1031
87
    }
1032
88
1033
89
    virtual bool IsValid() const {
1034
90
        return buffer_ != nullptr;
1035
91
    }
1036
92
1037
93
private:
1038
94
    MediaSourceBuffer() { }
1039
95
1040
96
    void ExtractTimestamp() {
1041
97
        auto meta_data = media_buffer_get_meta_data(buffer_);
1042
98
        if (!meta_data)
1043
99
            return;
1044
100
1045
101
        uint32_t key_time = media_meta_data_get_key_id(MEDIA_META_DATA_KEY_TIME);
1046
102
        int64_t time_us = 0;
1047
103
        media_meta_data_find_int64(meta_data, key_time, &time_us);
1048
104
1049
105
        SetTimestamp(time_us);
1050
106
    }
1051
107
1052
108
private:
1053
109
    MediaBufferWrapper *buffer_;
1054
110
};
1055
111
1056
112
video::BaseEncoder::Config H264Encoder::DefaultConfiguration() {
1057
113
    Config config;
1058
114
    // Supplying -1 as framerate means the encoder decides on what it
1059
115
    // can provide.
1060
116
    config.framerate = -1;
1061
117
    config.bitrate = 5000000;
1062
118
    config.i_frame_interval = 15;
1063
119
    config.intra_refresh_mode = kOMXVideoIntraRefreshCyclic;
1064
120
    return config;
1065
121
}
1066
122
1067
123
H264Encoder::Ptr H264Encoder::Create() {
1068
124
    return std::shared_ptr<H264Encoder>(new H264Encoder);
1069
125
}
1070
126
1071
127
H264Encoder::H264Encoder() :
1072
128
    format_(nullptr),
1073
129
    encoder_(nullptr),
1074
130
    running_(false),
1075
131
    input_queue_(mcs::video::BufferQueue::Create()),
1076
132
    start_time_(-1ll),
1077
133
    frame_count_(0) {
1078
134
}
1079
135
1080
136
H264Encoder::~H264Encoder() {
1081
137
    Stop();
1082
138
1083
139
    if (encoder_)
1084
140
        media_codec_source_release(encoder_);
1085
141
1086
142
    if (source_)
1087
143
        delete source_; /* media_source_release(source_); */
1088
144
1089
145
    if (format_)
1090
146
        media_message_release(format_);
1091
147
}
1092
148
1093
149
bool H264Encoder::IsValid() const {
1094
150
    return true;
1095
151
}
1096
152
1097
153
bool H264Encoder::Configure(const Config &config) {
1098
154
    if (encoder_)
1099
155
        return false;
1100
156
1101
157
    MCS_DEBUG("configuring with %dx%d@%d", config.width, config.height, config.framerate);
1102
158
1103
159
    auto format = media_message_create();
1104
160
    if (!format)
1105
161
        return false;
1106
162
1107
163
    media_message_set_string(format, "mime", kH264MimeType, 0);
1108
164
1109
165
    media_message_set_int32(format, "store-metadata-in-buffers", true);
1110
166
    media_message_set_int32(format, "store-metadata-in-buffers-output", false);
1111
167
1112
168
    media_message_set_int32(format, "width", config.width);
1113
169
    media_message_set_int32(format, "height", config.height);
1114
170
    media_message_set_int32(format, "stride", config.width);
1115
171
    media_message_set_int32(format, "slice-height", config.width);
1116
172
1117
173
    media_message_set_int32(format, "color-format", kOMXColorFormatAndroidOpaque);
1118
174
1119
175
    media_message_set_int32(format, "bitrate", config.bitrate);
1120
176
    media_message_set_int32(format, "bitrate-mode", kOMXVideoControlRateConstant);
1121
177
    media_message_set_int32(format, "frame-rate", config.framerate);
1122
178
1123
179
    media_message_set_int32(format, "intra-refresh-mode", 0);
1124
180
1125
181
    // Update macroblocks in a cyclic fashion with 10% of all MBs within
1126
182
    // frame gets updated at one time. It takes about 10 frames to
1127
183
    // completely update a whole video frame. If the frame rate is 30,
1128
184
    // it takes about 333 ms in the best case (if next frame is not an IDR)
1129
185
    // to recover from a lost/corrupted packet.
1130
186
    int32_t mbs = (((config.width + 15) / 16) * ((config.height + 15) / 16) * 10) / 100;
1131
187
    media_message_set_int32(format, "intra-refresh-CIR-mbs", mbs);
1132
188
1133
189
    if (config.i_frame_interval > 0)
1134
190
        media_message_set_int32(format, "i-frame-interval", config.i_frame_interval);
1135
191
1136
192
    if (config.profile_idc > 0)
1137
193
        media_message_set_int32(format, "profile-idc", config.profile_idc);
1138
194
1139
195
    if (config.level_idc > 0)
1140
196
        media_message_set_int32(format, "level-idc", config.level_idc);
1141
197
1142
198
    if (config.constraint_set > 0)
1143
199
        media_message_set_int32(format, "constraint-set", config.constraint_set);
1144
200
1145
201
    // FIXME we need to find a way to check if the encoder supports prepending
1146
202
    // SPS/PPS to the buffers it is producing or if we have to manually do that
1147
203
    media_message_set_int32(format, "prepend-sps-pps-to-idr-frames", 1);
1148
204
1149
205
    source_ = media_source_create();
1150
206
    if (!source_) {
1151
207
        MCS_ERROR("Failed to create media input source for encoder");
1152
208
        media_message_release(format);
1153
209
        return false;
1154
210
    }
1155
211
1156
212
    auto source_format = media_meta_data_create();
1157
213
1158
214
    // Notice that we're passing video/raw as mime type here which is quite
1159
215
    // important to let the encoder do the right thing with the incoming data
1160
216
    media_meta_data_set_cstring(source_format,
1161
217
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_MIME),
1162
218
        kRawMimeType);
1163
219
1164
220
    // We're setting the opaque color format here as the encoder is then
1165
221
    // meant to figure out the color format from the GL frames itself.
1166
222
    media_meta_data_set_int32(source_format,
1167
223
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_COLOR_FORMAT),
1168
224
        kOMXColorFormatAndroidOpaque);
1169
225
1170
226
    media_meta_data_set_int32(source_format,
1171
227
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_WIDTH),
1172
228
        config.width);
1173
229
    media_meta_data_set_int32(source_format,
1174
230
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_HEIGHT),
1175
231
        config.height);
1176
232
    media_meta_data_set_int32(source_format,
1177
233
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_STRIDE),
1178
234
        config.width);
1179
235
    media_meta_data_set_int32(source_format,
1180
236
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_SLICE_HEIGHT),
1181
237
        config.height);
1182
238
    media_meta_data_set_int32(source_format,
1183
239
        media_meta_data_get_key_id(MEDIA_META_DATA_KEY_FRAMERATE),
1184
240
        config.framerate);
1185
241
1186
242
    media_source_set_format(source_, source_format);
1187
243
1188
244
    media_source_set_start_callback(source_, &H264Encoder::OnSourceStart, this);
1189
245
    media_source_set_stop_callback(source_, &H264Encoder::OnSourceStop, this);
1190
246
    media_source_set_read_callback(source_, &H264Encoder::OnSourceRead, this);
1191
247
    media_source_set_pause_callback(source_, &H264Encoder::OnSourcePause, this);
1192
248
1193
249
    encoder_ = media_codec_source_create(format, source_, 0);
1194
250
    if (!encoder_) {
1195
251
        MCS_ERROR("Failed to create encoder instance");
1196
252
        return false;
1197
253
    }
1198
254
1199
255
    config_ = config;
1200
256
    format_ = format;
1201
257
1202
258
    MCS_DEBUG("Configured encoder succesfully");
1203
259
1204
260
    return true;
1205
261
}
1206
262
1207
263
void H264Encoder::Start() {
1208
264
    if (!encoder_ || running_)
1209
265
        return;
1210
266
1211
267
    if (!media_codec_source_start(encoder_)) {
1212
268
        MCS_ERROR("Failed to start encoder");
1213
269
        return;
1214
270
    }
1215
271
1216
272
    worker_thread_ = std::thread(&H264Encoder::WorkerThread, this);
1217
273
    pthread_setname_np(worker_thread_.native_handle(), kEncoderThreadName);
1218
274
1219
275
    running_ = true;
1220
276
1221
277
    MCS_DEBUG("Started encoder");
1222
278
}
1223
279
1224
280
int H264Encoder::OnSourceStart(MediaMetaDataWrapper *meta, void *user_data) {
1225
281
    auto thiz = static_cast<H264Encoder*>(user_data);
1226
282
1227
283
    MCS_DEBUG("");
1228
284
1229
285
    return 0;
1230
286
}
1231
287
1232
288
int H264Encoder::OnSourceStop(void *user_data) {
1233
289
    auto thiz = static_cast<H264Encoder*>(user_data);
1234
290
1235
291
    MCS_DEBUG("");
1236
292
1237
293
    return 0;
1238
294
}
1239
295
1240
296
MediaBufferWrapper* H264Encoder::PackBuffer(const mcs::video::Buffer::Ptr &input_buffer, const mcs::TimestampUs &timestamp) {
1241
297
    if (!input_buffer->NativeHandle()) {
1242
298
        MCS_WARNING("Ignoring buffer without native handle");
1243
299
        return nullptr;
1244
300
    }
1245
301
1246
302
    auto anwb = reinterpret_cast<ANativeWindowBuffer*>(input_buffer->NativeHandle());
1247
303
1248
304
    size_t size = sizeof(buffer_handle_t) + 4;
1249
305
1250
306
    // We let the media buffer allocate the memory here to let it keep
1251
307
    // the ownership and release the memory once its destroyed.
1252
308
    auto buffer = media_buffer_create(size);
1253
309
    auto data = media_buffer_get_data(buffer);
1254
310
1255
311
    // We're passing the buffer handle directly as part of the buffer data
1256
312
    // here to the encoder and it will figure out it has to deal with a
1257
313
    // buffer with the key value we put in front of it. See also
1258
314
    // frameworks/av/media/libstagefright/SurfaceMediaSource.cpp for more
1259
315
    // details about this.
1260
316
    uint32_t type = kMetadataBufferTypeGrallocSource;
1261
317
    memcpy(data, &type, 4);
1262
318
    memcpy(data + 4, &anwb->handle, sizeof(buffer_handle_t));
1263
319
1264
320
    media_buffer_set_return_callback(buffer, &H264Encoder::OnBufferReturned, this);
1265
321
1266
322
    // We need to put a reference on the buffer here if we want the
1267
323
    // callback we set above being called.
1268
324
    media_buffer_ref(buffer);
1269
325
1270
326
    auto meta = media_buffer_get_meta_data(buffer);
1271
327
    auto key_time = media_meta_data_get_key_id(MEDIA_META_DATA_KEY_TIME);
1272
328
    media_meta_data_set_int64(meta, key_time, timestamp);
1273
329
1274
330
    pending_buffers_.push_back(BufferItem{input_buffer, buffer});
1275
331
1276
332
    return buffer;
1277
333
}
1278
334
1279
335
int H264Encoder::OnSourceRead(MediaBufferWrapper **buffer, void *user_data) {
1280
336
    auto thiz = static_cast<H264Encoder*>(user_data);
1281
337
1282
338
    auto input_buffer = thiz->input_queue_->Next();
1283
339
1284
340
1285
341
    auto next_buffer = thiz->PackBuffer(input_buffer, input_buffer->Timestamp());
1286
342
1287
343
    if (!next_buffer)
1288
344
        return kAndroidMediaErrorEndOfStream;
1289
345
1290
346
    *buffer = next_buffer;
1291
347
1292
348
    return 0;
1293
349
}
1294
350
1295
351
int H264Encoder::OnSourcePause(void *user_data) {
1296
352
    auto thiz = static_cast<H264Encoder*>(user_data);
1297
353
1298
354
    MCS_DEBUG("");
1299
355
1300
356
    return 0;
1301
357
}
1302
358
1303
359
void H264Encoder::OnBufferReturned(MediaBufferWrapper *buffer, void *user_data) {
1304
360
    auto thiz = static_cast<H264Encoder*>(user_data);
1305
361
1306
362
    // Find the right pending buffer matching the returned one
1307
363
    auto iter = thiz->pending_buffers_.begin();
1308
364
    for (; iter != thiz->pending_buffers_.end(); ++iter) {
1309
365
        if (iter->media_buffer == buffer)
1310
366
            break;
1311
367
    }
1312
368
1313
369
    if (iter == thiz->pending_buffers_.end()) {
1314
370
        MCS_WARNING("Didn't remember returned buffer!?");
1315
371
        return;
1316
372
    }
1317
373
1318
374
    // Unset observer to be able to call release on the MediaBuffer
1319
375
    // and reduce its reference count. It has an internal check if
1320
376
    // an observer is still set or not before it will actually release
1321
377
    // itself.
1322
378
    media_buffer_set_return_callback(iter->media_buffer, nullptr, nullptr);
1323
379
    media_buffer_release(iter->media_buffer);
1324
380
1325
381
    auto buf = iter->buffer;
1326
382
    thiz->pending_buffers_.erase(iter);
1327
383
1328
384
    // After we've cleaned up everything we can send the buffer
1329
385
    // back to the producer which then can reuse it.
1330
386
    buf->Release();
1331
387
}
1332
388
1333
389
bool H264Encoder::DoesBufferContainCodecConfig(MediaBufferWrapper *buffer) {
1334
390
    auto meta_data = media_buffer_get_meta_data(buffer);
1335
391
    if (!meta_data)
1336
392
        return false;
1337
393
1338
394
    uint32_t key_is_codec_config = media_meta_data_get_key_id(MEDIA_META_DATA_KEY_IS_CODEC_CONFIG);
1339
395
    int32_t is_codec_config = 0;
1340
396
    media_meta_data_find_int32(meta_data, key_is_codec_config, &is_codec_config);
1341
397
    return static_cast<bool>(is_codec_config);
1342
398
}
1343
399
1344
400
void H264Encoder::WorkerThread() {
1345
401
    MCS_DEBUG("Encoder worker thread is running");
1346
402
1347
403
    while (running_) {
1348
404
        MediaBufferWrapper *buffer = nullptr;
1349
405
        if (!media_codec_source_read(encoder_, &buffer)) {
1350
406
            MCS_ERROR("Failed to read a new buffer from encoder");
1351
407
            return;
1352
408
        }
1353
409
1354
410
        auto mbuf = MediaSourceBuffer::Create(buffer);
1355
411
1356
412
        if (mbuf->Timestamp() > 0) {
1357
413
            int64_t now = mcs::Utils::GetNowUs();
1358
414
            int64_t diff = (now - mbuf->Timestamp()) / 1000ll;
1359
415
            video::Statistics::Instance()->RecordEncoderBufferOut(diff);
1360
416
        }
1361
417
1362
418
        if (DoesBufferContainCodecConfig(buffer)) {
1363
419
            if (auto sp = delegate_.lock())
1364
420
                sp->OnBufferWithCodecConfig(mbuf);
1365
421
        }
1366
422
1367
423
        if (auto sp = delegate_.lock())
1368
424
            sp->OnBufferAvailable(mbuf);
1369
425
    }
1370
426
}
1371
427
1372
428
void H264Encoder::Stop() {
1373
429
    if (!encoder_ || !running_)
1374
430
        return;
1375
431
1376
432
    if (!media_codec_source_stop(encoder_))
1377
433
        return;
1378
434
1379
435
    running_ = false;
1380
436
    worker_thread_.join();
1381
437
}
1382
438
1383
439
void H264Encoder::QueueBuffer(const video::Buffer::Ptr &buffer) {
1384
440
    input_queue_->Push(buffer);
1385
441
}
1386
442
1387
443
void* H264Encoder::NativeWindowHandle() const {
1388
444
    if (!encoder_)
1389
445
        return nullptr;
1390
446
1391
447
    return media_codec_source_get_native_window_handle(encoder_);
1392
448
}
1393
449
1394
450
video::BaseEncoder::Config H264Encoder::Configuration() const {
1395
451
    return config_;
1396
452
}
1397
453
1398
454
void H264Encoder::SendIDRFrame() {
1399
455
    if (!encoder_)
1400
456
        return;
1401
457
1402
458
    MCS_DEBUG("");
1403
459
1404
460
    media_codec_source_request_idr_frame(encoder_);
1405
461
}
1406
462
1407
463
} // namespace android
1408
464
} // namespace mcs
1409
0
465
1410
=== added file 'src/mcs/android/h264encoder.h'
1411
--- src/mcs/android/h264encoder.h	1970-01-01 00:00:00 +0000
1412
+++ src/mcs/android/h264encoder.h	2016-02-25 12:47:02 +0000
1413
@@ -0,0 +1,96 @@
1414
1
/*
1415
2
 * Copyright (C) 2016 Canonical, Ltd.
1416
3
 *
1417
4
 * This program is free software: you can redistribute it and/or modify it
1418
5
 * under the terms of the GNU General Public License version 3, as published
1419
6
 * by the Free Software Foundation.
1420
7
 *
1421
8
 * This program is distributed in the hope that it will be useful, but
1422
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1423
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1424
11
 * PURPOSE.  See the GNU General Public License for more details.
1425
12
 *
1426
13
 * You should have received a copy of the GNU General Public License along
1427
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1428
15
 *
1429
16
 */
1430
17
1431
18
#ifndef MCS_ANDORID_ENCODER_H_
1432
19
#define MCS_ANDORID_ENCODER_H_
1433
20
1434
21
#include <memory>
1435
22
#include <thread>
1436
23
1437
24
#include <hybris/media/media_codec_source_layer.h>
1438
25
1439
26
#include "mcs/non_copyable.h"
1440
27
#include "mcs/utils.h"
1441
28
1442
29
#include "mcs/video/baseencoder.h"
1443
30
#include "mcs/video/bufferqueue.h"
1444
31
1445
32
namespace mcs {
1446
33
namespace android {
1447
34
class H264Encoder : public video::BaseEncoder {
1448
35
public:
1449
36
    typedef std::shared_ptr<H264Encoder> Ptr;
1450
37
1451
38
    static BaseEncoder::Config DefaultConfiguration();
1452
39
1453
40
    static Ptr Create();
1454
41
1455
42
    ~H264Encoder();
1456
43
1457
44
    bool IsValid() const override;
1458
45
1459
46
    bool Configure(const BaseEncoder::Config &config);
1460
47
1461
48
    void Start() override;
1462
49
    void Stop() override;
1463
50
1464
51
    void QueueBuffer(const mcs::video::Buffer::Ptr &buffer);
1465
52
1466
53
    void* NativeWindowHandle() const override;
1467
54
    BaseEncoder::Config Configuration() const override;
1468
55
1469
56
    void SendIDRFrame() override;
1470
57
1471
58
private:
1472
59
    H264Encoder();
1473
60
1474
61
    void WorkerThread();
1475
62
1476
63
    bool DoesBufferContainCodecConfig(MediaBufferWrapper *buffer);
1477
64
1478
65
    MediaBufferWrapper* PackBuffer(const mcs::video::Buffer::Ptr &input_buffer, const mcs::TimestampUs &timestamp);
1479
66
1480
67
private:
1481
68
    static int OnSourceStart(MediaMetaDataWrapper *meta, void *user_data);
1482
69
    static int OnSourceStop(void *user_data);
1483
70
    static int OnSourceRead(MediaBufferWrapper **buffer, void *user_data);
1484
71
    static int OnSourcePause(void *user_data);
1485
72
1486
73
    static void OnBufferReturned(MediaBufferWrapper *buffer, void *user_data);
1487
74
1488
75
private:
1489
76
    struct BufferItem {
1490
77
        mcs::video::Buffer::Ptr buffer;
1491
78
        MediaBufferWrapper *media_buffer;
1492
79
    };
1493
80
1494
81
private:
1495
82
    BaseEncoder::Config config_;
1496
83
    MediaMessageWrapper *format_;
1497
84
    MediaSourceWrapper *source_;
1498
85
    MediaCodecSourceWrapper *encoder_;
1499
86
    bool running_;
1500
87
    std::thread worker_thread_;
1501
88
    mcs::video::BufferQueue::Ptr input_queue_;
1502
89
    std::vector<BufferItem> pending_buffers_;
1503
90
    mcs::TimestampUs start_time_;
1504
91
    uint32_t frame_count_;
1505
92
};
1506
93
} // namespace android
1507
94
} // namespace mcs
1508
95
1509
96
#endif
1510
0
97
1511
=== modified file 'src/mcs/basesourcemediamanager.cpp'
1512
--- src/mcs/basesourcemediamanager.cpp	2015-12-07 16:02:43 +0000
1513
+++ src/mcs/basesourcemediamanager.cpp	2016-02-25 12:47:02 +0000
1514
@@ -15,12 +15,23 @@
1515
15
 *
15
 *
1516
16
 */
16
 */
1517
17
17
1518
18
#include <iostream>
1519
19
1520
18
#include <glib.h>
20
#include <glib.h>
1521
19
21
1524
20
#include "basesourcemediamanager.h"
22
#include "mcs/logger.h"
1525
21
#include "logger.h"
23
#include "mcs/basesourcemediamanager.h"
1526
24
#include "mcs/video/videoformat.h"
1527
25
1528
26
namespace {
1529
27
static unsigned int next_session_id = 0;
1530
28
}
1531
22
29
1532
23
namespace mcs {
30
namespace mcs {
1533
31
BaseSourceMediaManager::BaseSourceMediaManager() :
1534
32
    session_id_(++next_session_id) {
1535
33
}
1536
34
1537
24
wds::SessionType BaseSourceMediaManager::GetSessionType() const {
35
wds::SessionType BaseSourceMediaManager::GetSessionType() const {
1538
25
    return wds::VideoSession;
36
    return wds::VideoSession;
1539
26
}
37
}
1540
@@ -38,24 +49,29 @@
1541
38
    return sink_port1_;
49
    return sink_port1_;
1542
39
}
50
}
1543
40
51
1545
41
std::vector<wds::H264VideoCodec> GetH264VideoCodecs() {
52
std::vector<wds::H264VideoCodec> BaseSourceMediaManager::GetH264VideoCodecs() {
1546
42
    static std::vector<wds::H264VideoCodec> codecs;
53
    static std::vector<wds::H264VideoCodec> codecs;
1547
43
    if (codecs.empty()) {
54
    if (codecs.empty()) {
1548
44
        wds::RateAndResolutionsBitmap cea_rr;
55
        wds::RateAndResolutionsBitmap cea_rr;
1549
45
        wds::RateAndResolutionsBitmap vesa_rr;
56
        wds::RateAndResolutionsBitmap vesa_rr;
1550
46
        wds::RateAndResolutionsBitmap hh_rr;
57
        wds::RateAndResolutionsBitmap hh_rr;
1563
47
        wds::RateAndResolution i;
58
1564
48
        // declare that we support all resolutions, CHP and level 4.2
59
        // We only support 720p here for now as that is our best performing
1565
49
        // gstreamer should handle all of it :)
60
        // resolution with regard of all other bits in the pipeline. Eventually
1566
50
        for (i = wds::CEA640x480p60; i <= wds::CEA1920x1080p24; ++i)
61
        // we will add 60 Hz here too but for now only everything up to 30 Hz.
1567
51
            cea_rr.set(i);
62
        cea_rr.set(wds::CEA1280x720p30);
1568
52
        for (i = wds::VESA800x600p30; i <= wds::VESA1920x1200p30; ++i)
63
        cea_rr.set(wds::CEA1280x720p25);
1569
53
            vesa_rr.set(i);
64
        cea_rr.set(wds::CEA1280x720p24);
1570
54
        for (i = wds::HH800x480p30; i <= wds::HH848x480p60; ++i)
65
1571
55
            hh_rr.set(i);
66
        // FIXME which profiles and formats we support highly depends on what
1572
56
67
        // android supports. But for now we just consider CBP with level 3.1
1573
57
        wds::H264VideoCodec codec(wds::CHP, wds::k4_2, cea_rr, vesa_rr, hh_rr);
68
        // as that is the same Android configures its setup with.
1574
58
        codecs.push_back(codec);
69
        wds::H264VideoCodec codec1(wds::CBP, wds::k3_1, cea_rr, vesa_rr, hh_rr);
1575
70
        codecs.push_back(codec1);
1576
71
1577
72
        DEBUG("Video codecs supported by us:");
1578
73
        for (auto c : codecs)
1579
74
            mcs::video::DumpVideoCodec(c);
1580
59
    }
75
    }
1581
60
76
1582
61
    return codecs;
77
    return codecs;
1583
@@ -64,19 +80,32 @@
1584
64
bool BaseSourceMediaManager::InitOptimalVideoFormat(const wds::NativeVideoFormat& sink_native_format,
80
bool BaseSourceMediaManager::InitOptimalVideoFormat(const wds::NativeVideoFormat& sink_native_format,
1585
65
    const std::vector<wds::H264VideoCodec>& sink_supported_codecs) {
81
    const std::vector<wds::H264VideoCodec>& sink_supported_codecs) {
1586
66
82
1587
83
    DEBUG("Sink native resolution:");
1588
84
    mcs::video::DumpNativeFormat(sink_native_format);
1589
85
1590
86
    DEBUG("Sink supports the following codecs:");
1591
87
    for (auto sink_codec : sink_supported_codecs) {
1592
88
        mcs::video::DumpVideoCodec(sink_codec);
1593
89
    }
1594
90
1595
91
    bool success = false;
1596
92
1597
67
    format_ = wds::FindOptimalVideoFormat(sink_native_format,
93
    format_ = wds::FindOptimalVideoFormat(sink_native_format,
1598
68
                                         GetH264VideoCodecs(),
94
                                         GetH264VideoCodecs(),
1610
69
                                         sink_supported_codecs);
95
                                         sink_supported_codecs,
1611
70
96
                                         &success);
1612
71
    INFO("Found optimal video format");
97
1613
72
    INFO("  profile: %d", format_.profile);
98
    // Workaround buggy wds code ..
1614
73
    INFO("  level: %d", format_.level);
99
    if (format_.rate_resolution == wds::CEA1280x720p60)
1615
74
    INFO("  res type %d", format_.type);
100
        format_.rate_resolution = wds::CEA1280x720p30;
1616
75
    INFO("  rate & resolution %d", format_.rate_resolution);
101
1617
76
102
    if (!success)
1618
77
    Configure();
103
        MCS_WARNING("Failed to select proper video format");
1619
78
104
1620
79
    return true;
105
    DEBUG("Found optimal video format:");
1621
106
    mcs::video::DumpVideoFormat(format_);
1622
107
1623
108
    return Configure();
1624
80
}
109
}
1625
81
110
1626
82
wds::H264VideoFormat BaseSourceMediaManager::GetOptimalVideoFormat() const {
111
wds::H264VideoFormat BaseSourceMediaManager::GetOptimalVideoFormat() const {
1627
@@ -102,4 +131,8 @@
1628
102
void BaseSourceMediaManager::SendIDRPicture() {
131
void BaseSourceMediaManager::SendIDRPicture() {
1629
103
    WARNING("Unimplemented IDR picture request");
132
    WARNING("Unimplemented IDR picture request");
1630
104
}
133
}
1631
134
1632
135
std::string BaseSourceMediaManager::GetSessionId() const {
1633
136
    return mcs::Utils::Sprintf("%d", session_id_);
1634
137
}
1635
105
} // namespace mcs
138
} // namespace mcs
1636
106
139
1637
=== modified file 'src/mcs/basesourcemediamanager.h'
1638
--- src/mcs/basesourcemediamanager.h	2015-11-26 16:48:53 +0000
1639
+++ src/mcs/basesourcemediamanager.h	2016-02-25 12:47:02 +0000
1640
@@ -24,9 +24,11 @@
1641
24
class BaseSourceMediaManager : public wds::SourceMediaManager
24
class BaseSourceMediaManager : public wds::SourceMediaManager
1642
25
{
25
{
1643
26
public:
26
public:
1644
27
    explicit BaseSourceMediaManager();
1645
28
1646
27
    void SetSinkRtpPorts(int port1, int port2) override;
29
    void SetSinkRtpPorts(int port1, int port2) override;
1647
28
    std::pair<int,int> GetSinkRtpPorts() const override;
30
    std::pair<int,int> GetSinkRtpPorts() const override;
1649
29
    int GetLocalRtpPort() const override;
31
    virtual int GetLocalRtpPort() const override;
1650
30
    wds::SessionType GetSessionType() const override;
32
    wds::SessionType GetSessionType() const override;
1651
31
33
1652
32
    bool InitOptimalVideoFormat(const wds::NativeVideoFormat& sink_native_format,
34
    bool InitOptimalVideoFormat(const wds::NativeVideoFormat& sink_native_format,
1653
@@ -34,15 +36,18 @@
1654
34
    wds::H264VideoFormat GetOptimalVideoFormat() const override;
36
    wds::H264VideoFormat GetOptimalVideoFormat() const override;
1655
35
    bool InitOptimalAudioFormat(const std::vector<wds::AudioCodec>& sink_supported_codecs) override;
37
    bool InitOptimalAudioFormat(const std::vector<wds::AudioCodec>& sink_supported_codecs) override;
1656
36
    wds::AudioCodec GetOptimalAudioFormat() const override;
38
    wds::AudioCodec GetOptimalAudioFormat() const override;
1658
37
    void SendIDRPicture() override;
39
    virtual void SendIDRPicture() override;
1659
40
    std::string GetSessionId() const override;
1660
38
41
1661
39
protected:
42
protected:
1663
40
    virtual void Configure() = 0;
43
    virtual bool Configure() = 0;
1664
44
    virtual std::vector<wds::H264VideoCodec> GetH264VideoCodecs();
1665
41
45
1666
42
protected:
46
protected:
1667
43
    int sink_port1_;
47
    int sink_port1_;
1668
44
    int sink_port2_;
48
    int sink_port2_;
1669
45
    wds::H264VideoFormat format_;
49
    wds::H264VideoFormat format_;
1670
50
    unsigned int session_id_;
1671
46
};
51
};
1672
47
} // namespace mcs
52
} // namespace mcs
1673
48
#endif
53
#endif
1674
49
54
1675
=== added file 'src/mcs/config.h.in'
1676
--- src/mcs/config.h.in	1970-01-01 00:00:00 +0000
1677
+++ src/mcs/config.h.in	2016-02-25 12:47:02 +0000
1678
@@ -0,0 +1,25 @@
1679
1
/*
1680
2
 * Copyright (C) 2015 Canonical, Ltd.
1681
3
 *
1682
4
 * This program is free software: you can redistribute it and/or modify it
1683
5
 * under the terms of the GNU General Public License version 3, as published
1684
6
 * by the Free Software Foundation.
1685
7
 *
1686
8
 * This program is distributed in the hope that it will be useful, but
1687
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1688
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1689
11
 * PURPOSE.  See the GNU General Public License for more details.
1690
12
 *
1691
13
 * You should have received a copy of the GNU General Public License along
1692
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1693
15
 *
1694
16
 */
1695
17
1696
18
#ifndef MCS_CONFIG_H_
1697
19
#define MCS_CONFIG_H_
1698
20
1699
21
namespace mcs {
1700
22
constexpr const char* kRuntimePath{"/run/aethercast"};
1701
23
}
1702
24
1703
25
#endif
1704
0
26
1705
=== removed file 'src/mcs/config.h.in'
1706
--- src/mcs/config.h.in	2016-01-19 21:50:49 +0000
1707
+++ src/mcs/config.h.in	1970-01-01 00:00:00 +0000
1708
@@ -1,25 +0,0 @@
1709
1
/*
1710
2
 * Copyright (C) 2015 Canonical, Ltd.
1711
3
 *
1712
4
 * This program is free software: you can redistribute it and/or modify it
1713
5
 * under the terms of the GNU General Public License version 3, as published
1714
6
 * by the Free Software Foundation.
1715
7
 *
1716
8
 * This program is distributed in the hope that it will be useful, but
1717
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1718
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1719
11
 * PURPOSE.  See the GNU General Public License for more details.
1720
12
 *
1721
13
 * You should have received a copy of the GNU General Public License along
1722
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1723
15
 *
1724
16
 */
1725
17
1726
18
#ifndef MCS_CONFIG_H_
1727
19
#define MCS_CONFIG_H_
1728
20
1729
21
namespace mcs {
1730
22
constexpr const char* kRuntimePath{"/run/aethercast"};
1731
23
}
1732
24
1733
25
#endif
1734
26
0
1735
=== modified file 'src/mcs/forwardingmiracastcontroller.cpp'
1736
--- src/mcs/forwardingmiracastcontroller.cpp	2016-01-21 13:25:31 +0000
1737
+++ src/mcs/forwardingmiracastcontroller.cpp	2016-02-25 12:47:02 +0000
1738
@@ -42,8 +42,12 @@
1739
42
    fwd_->Disconnect(device, callback);
42
    fwd_->Disconnect(device, callback);
1740
43
}
43
}
1741
44
44
1744
45
void ForwardingMiracastController::Scan(const std::chrono::seconds &timeout) {
45
void ForwardingMiracastController::DisconnectAll(ResultCallback callback) {
1745
46
    fwd_->Scan(timeout);
46
    fwd_->DisconnectAll(callback);
1746
47
}
1747
48
1748
49
mcs::Error ForwardingMiracastController::Scan(const std::chrono::seconds &timeout) {
1749
50
    return fwd_->Scan(timeout);
1750
47
}
51
}
1751
48
52
1752
49
NetworkDeviceState ForwardingMiracastController::State() const {
53
NetworkDeviceState ForwardingMiracastController::State() const {
1753
50
54
1754
=== modified file 'src/mcs/forwardingmiracastcontroller.h'
1755
--- src/mcs/forwardingmiracastcontroller.h	2016-01-21 13:25:31 +0000
1756
+++ src/mcs/forwardingmiracastcontroller.h	2016-02-25 12:47:02 +0000
1757
@@ -32,7 +32,9 @@
1758
32
    virtual void Connect(const NetworkDevice::Ptr &device, ResultCallback callback) override;
32
    virtual void Connect(const NetworkDevice::Ptr &device, ResultCallback callback) override;
1759
33
    virtual void Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback) override;
33
    virtual void Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback) override;
1760
34
34
1762
35
    virtual void Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) override;
35
    virtual void DisconnectAll(ResultCallback callback) override;
1763
36
1764
37
    virtual mcs::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) override;
1765
36
38
1766
37
    virtual NetworkDeviceState State() const override;
39
    virtual NetworkDeviceState State() const override;
1767
38
    virtual std::vector<NetworkManager::Capability> Capabilities() const override;
40
    virtual std::vector<NetworkManager::Capability> Capabilities() const override;
1768
39
41
1769
=== removed file 'src/mcs/forwardingnetworkdevice.cpp'
1770
--- src/mcs/forwardingnetworkdevice.cpp	2015-12-16 08:04:35 +0000
1771
+++ src/mcs/forwardingnetworkdevice.cpp	1970-01-01 00:00:00 +0000
1772
@@ -1,51 +0,0 @@
1773
1
/*
1774
2
* Copyright (C) 2015 Canonical, Ltd.
1775
3
*
1776
4
* This program is free software: you can redistribute it and/or modify it
1777
5
* under the terms of the GNU General Public License version 3, as published
1778
6
* by the Free Software Foundation.
1779
7
*
1780
8
* This program is distributed in the hope that it will be useful, but
1781
9
* WITHOUT ANY WARRANTY; without even the implied warranties of
1782
10
* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1783
11
* PURPOSE.  See the GNU General Public License for more details.
1784
12
*
1785
13
* You should have received a copy of the GNU General Public License along
1786
14
* with this program.  If not, see <http://www.gnu.org/licenses/>.
1787
15
*
1788
16
*/
1789
17
1790
18
#include "forwardingnetworkdevice.h"
1791
19
1792
20
namespace mcs {
1793
21
1794
22
ForwardingNetworkDevice::ForwardingNetworkDevice(const NetworkDevice::Ptr& fwd) : fwd_(fwd) {
1795
23
    if (not fwd_) {
1796
24
        throw std::logic_error{"Cannot operate without a valid NetworkDevice instance."};
1797
25
    }
1798
26
}
1799
27
1800
28
MacAddress ForwardingNetworkDevice::Address() const {
1801
29
    return fwd_->Address();
1802
30
}
1803
31
1804
32
IpV4Address ForwardingNetworkDevice::IPv4Address() const {
1805
33
    return fwd_->IPv4Address();
1806
34
}
1807
35
1808
36
std::string ForwardingNetworkDevice::Name() const {
1809
37
    return fwd_->Name();
1810
38
}
1811
39
1812
40
NetworkDeviceState ForwardingNetworkDevice::State() const {
1813
41
    return fwd_->State();
1814
42
}
1815
43
1816
44
std::vector<NetworkDeviceRole> ForwardingNetworkDevice::SupportedRoles() const {
1817
45
    return fwd_->SupportedRoles();
1818
46
}
1819
47
1820
48
const NetworkDevice::Ptr& ForwardingNetworkDevice::Fwd() const {
1821
49
    return fwd_;
1822
50
}
1823
51
} // namespace mcs
1824
52
0
1825
=== added file 'src/mcs/forwardingnetworkdevice.h'
1826
--- src/mcs/forwardingnetworkdevice.h	1970-01-01 00:00:00 +0000
1827
+++ src/mcs/forwardingnetworkdevice.h	2016-02-25 12:47:02 +0000
1828
@@ -0,0 +1,42 @@
1829
1
/*
1830
2
* Copyright (C) 2015 Canonical, Ltd.
1831
3
*
1832
4
* This program is free software: you can redistribute it and/or modify it
1833
5
* under the terms of the GNU General Public License version 3, as published
1834
6
* by the Free Software Foundation.
1835
7
*
1836
8
* This program is distributed in the hope that it will be useful, but
1837
9
* WITHOUT ANY WARRANTY; without even the implied warranties of
1838
10
* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1839
11
* PURPOSE.  See the GNU General Public License for more details.
1840
12
*
1841
13
* You should have received a copy of the GNU General Public License along
1842
14
* with this program.  If not, see <http://www.gnu.org/licenses/>.
1843
15
*
1844
16
*/
1845
17
1846
18
#ifndef FORWARDINGNETWORKDEVICE_H_
1847
19
#define FORWARDINGNETWORKDEVICE_H_
1848
20
1849
21
#include "networkdevice.h"
1850
22
1851
23
namespace mcs {
1852
24
1853
25
class ForwardingNetworkDevice : public NetworkDevice {
1854
26
public:
1855
27
    ForwardingNetworkDevice(const NetworkDevice::Ptr& fwd);
1856
28
1857
29
    MacAddress Address() const override;
1858
30
    IpV4Address IPv4Address() const override;
1859
31
    std::string Name() const override;
1860
32
    NetworkDeviceState State() const override;
1861
33
    std::vector<NetworkDeviceRole> SupportedRoles() const override;
1862
34
1863
35
protected:
1864
36
    const NetworkDevice::Ptr& Fwd() const;
1865
37
1866
38
private:
1867
39
    NetworkDevice::Ptr fwd_;
1868
40
};
1869
41
} // namespace mcs
1870
42
#endif
1871
0
43
1872
=== removed file 'src/mcs/forwardingnetworkdevice.h'
1873
--- src/mcs/forwardingnetworkdevice.h	2015-12-16 08:04:35 +0000
1874
+++ src/mcs/forwardingnetworkdevice.h	1970-01-01 00:00:00 +0000
1875
@@ -1,42 +0,0 @@
1876
1
/*
1877
2
* Copyright (C) 2015 Canonical, Ltd.
1878
3
*
1879
4
* This program is free software: you can redistribute it and/or modify it
1880
5
* under the terms of the GNU General Public License version 3, as published
1881
6
* by the Free Software Foundation.
1882
7
*
1883
8
* This program is distributed in the hope that it will be useful, but
1884
9
* WITHOUT ANY WARRANTY; without even the implied warranties of
1885
10
* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1886
11
* PURPOSE.  See the GNU General Public License for more details.
1887
12
*
1888
13
* You should have received a copy of the GNU General Public License along
1889
14
* with this program.  If not, see <http://www.gnu.org/licenses/>.
1890
15
*
1891
16
*/
1892
17
1893
18
#ifndef FORWARDINGNETWORKDEVICE_H_
1894
19
#define FORWARDINGNETWORKDEVICE_H_
1895
20
1896
21
#include "networkdevice.h"
1897
22
1898
23
namespace mcs {
1899
24
1900
25
class ForwardingNetworkDevice : public NetworkDevice {
1901
26
public:
1902
27
    ForwardingNetworkDevice(const NetworkDevice::Ptr& fwd);
1903
28
1904
29
    MacAddress Address() const override;
1905
30
    IpV4Address IPv4Address() const override;
1906
31
    std::string Name() const override;
1907
32
    NetworkDeviceState State() const override;
1908
33
    std::vector<NetworkDeviceRole> SupportedRoles() const override;
1909
34
1910
35
protected:
1911
36
    const NetworkDevice::Ptr& Fwd() const;
1912
37
1913
38
private:
1914
39
    NetworkDevice::Ptr fwd_;
1915
40
};
1916
41
} // namespace mcs
1917
42
#endif
1918
43
0
1919
=== modified file 'src/mcs/gstsourcemediamanager.cpp'
1920
--- src/mcs/gstsourcemediamanager.cpp	2015-12-09 16:07:13 +0000
1921
+++ src/mcs/gstsourcemediamanager.cpp	2016-02-25 12:47:02 +0000
1922
@@ -60,48 +60,65 @@
1923
60
        g_free (debug);
60
        g_free (debug);
1924
61
        break;
61
        break;
1925
62
    default:
62
    default:
1927
63
        /* unhandled message */
63
        DEBUG("");
1928
64
        break;
64
        break;
1929
65
    }
65
    }
1930
66
66
1931
67
    return TRUE;
67
    return TRUE;
1932
68
}
68
}
1933
69
69
1935
70
void GstSourceMediaManager::Configure() {
70
bool GstSourceMediaManager::Configure() {
1936
71
    DEBUG("");
1937
72
1938
71
    pipeline_ = ConstructPipeline(format_);
73
    pipeline_ = ConstructPipeline(format_);
1939
74
    if (!pipeline_)
1940
75
        return false;
1941
72
76
1942
73
    ScopedGObject<GstBus> bus{gst_pipeline_get_bus (GST_PIPELINE(pipeline_.get()))};
77
    ScopedGObject<GstBus> bus{gst_pipeline_get_bus (GST_PIPELINE(pipeline_.get()))};
1943
74
    bus_watch_id_ = gst_bus_add_watch(bus.get(), &GstSourceMediaManager::OnGstBusEvent, nullptr);
78
    bus_watch_id_ = gst_bus_add_watch(bus.get(), &GstSourceMediaManager::OnGstBusEvent, nullptr);
1944
75
79
1945
76
    // Prepare pipeline so we're ready to go as soon as needed
80
    // Prepare pipeline so we're ready to go as soon as needed
1946
77
    gst_element_set_state(pipeline_.get(), GST_STATE_READY);
81
    gst_element_set_state(pipeline_.get(), GST_STATE_READY);
1947
82
1948
83
    return true;
1949
78
}
84
}
1950
79
85
1951
80
void GstSourceMediaManager::Play() {
86
void GstSourceMediaManager::Play() {
1952
81
    if (!pipeline_)
87
    if (!pipeline_)
1953
82
        return;
88
        return;
1954
83
89
1955
90
    DEBUG("");
1956
91
1957
84
    gst_element_set_state(pipeline_.get(), GST_STATE_PLAYING);
92
    gst_element_set_state(pipeline_.get(), GST_STATE_PLAYING);
1958
93
    gst_element_get_state(pipeline_.get(), nullptr, nullptr, GST_CLOCK_TIME_NONE);
1959
85
}
94
}
1960
86
95
1961
87
void GstSourceMediaManager::Pause() {
96
void GstSourceMediaManager::Pause() {
1962
88
    if (!pipeline_)
97
    if (!pipeline_)
1963
89
        return;
98
        return;
1964
90
99
1965
100
    DEBUG("");
1966
101
1967
91
    gst_element_set_state(pipeline_.get(), GST_STATE_PAUSED);
102
    gst_element_set_state(pipeline_.get(), GST_STATE_PAUSED);
1968
103
    gst_element_get_state(pipeline_.get(), nullptr, nullptr, GST_CLOCK_TIME_NONE);
1969
92
}
104
}
1970
93
105
1971
94
void GstSourceMediaManager::Teardown() {
106
void GstSourceMediaManager::Teardown() {
1972
95
    if (!pipeline_)
107
    if (!pipeline_)
1973
96
        return;
108
        return;
1974
97
109
1975
110
    DEBUG("");
1976
111
1977
98
    gst_element_set_state(pipeline_.get(), GST_STATE_READY);
112
    gst_element_set_state(pipeline_.get(), GST_STATE_READY);
1978
113
    gst_element_get_state(pipeline_.get(), nullptr, nullptr, GST_CLOCK_TIME_NONE);
1979
99
}
114
}
1980
100
115
1981
101
bool GstSourceMediaManager::IsPaused() const {
116
bool GstSourceMediaManager::IsPaused() const {
1982
102
    if (!pipeline_)
117
    if (!pipeline_)
1983
103
        return true;
118
        return true;
1984
104
119
1985
120
    DEBUG("");
1986
121
1987
105
    GstState state;
122
    GstState state;
1988
106
    gst_element_get_state(pipeline_.get(), &state, nullptr, GST_CLOCK_TIME_NONE);
123
    gst_element_get_state(pipeline_.get(), &state, nullptr, GST_CLOCK_TIME_NONE);
1989
107
124
1990
108
125
1991
=== modified file 'src/mcs/gstsourcemediamanager.h'
1992
--- src/mcs/gstsourcemediamanager.h	2015-11-30 16:16:49 +0000
1993
+++ src/mcs/gstsourcemediamanager.h	2016-02-25 12:47:02 +0000
1994
@@ -29,7 +29,7 @@
1995
29
                              public BaseSourceMediaManager
29
                              public BaseSourceMediaManager
1996
30
{
30
{
1997
31
public:
31
public:
1999
32
    ~GstSourceMediaManager();
32
    virtual ~GstSourceMediaManager();
2000
33
33
2001
34
    void Play() override;
34
    void Play() override;
2002
35
    void Pause() override;
35
    void Pause() override;
2003
@@ -38,7 +38,7 @@
2004
38
38
2005
39
protected:
39
protected:
2006
40
    GstSourceMediaManager();
40
    GstSourceMediaManager();
2008
41
    void Configure() override;
41
    bool Configure() override;
2009
42
42
2010
43
    virtual SharedGObject<GstElement> ConstructPipeline(const wds::H264VideoFormat &format) = 0;
43
    virtual SharedGObject<GstElement> ConstructPipeline(const wds::H264VideoFormat &format) = 0;
2011
44
44
2012
45
45
2013
=== added file 'src/mcs/initgstreameronce.cpp'
2014
--- src/mcs/initgstreameronce.cpp	1970-01-01 00:00:00 +0000
2015
+++ src/mcs/initgstreameronce.cpp	2016-02-25 12:47:02 +0000
2016
@@ -0,0 +1,88 @@
2017
1
/*
2018
2
 * Copyright (C) 2015 Canonical, Ltd.
2019
3
 *
2020
4
 * This program is free software: you can redistribute it and/or modify it
2021
5
 * under the terms of the GNU General Public License version 3, as published
2022
6
 * by the Free Software Foundation.
2023
7
 *
2024
8
 * This program is distributed in the hope that it will be useful, but
2025
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
2026
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
2027
11
 * PURPOSE.  See the GNU General Public License for more details.
2028
12
 *
2029
13
 * You should have received a copy of the GNU General Public License along
2030
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2031
15
 *
2032
16
 */
2033
17
2034
18
#include <atomic>
2035
19
2036
20
#include <gst/gst.h>
2037
21
2038
22
#include "initgstreameronce.h"
2039
23
#include "logger.h"
2040
24
2041
25
namespace {
2042
26
void GstLog (GstDebugCategory *category,
2043
27
          GstDebugLevel level,
2044
28
          const gchar *file,
2045
29
          const gchar *function,
2046
30
          gint line,
2047
31
          GObject *object,
2048
32
          GstDebugMessage *message,
2049
33
          gpointer user_data) {
2050
34
2051
35
    boost::optional<mcs::Logger::Location> location;
2052
36
    if (file && function && line > 0) {
2053
37
        location = mcs::Logger::Location{file, function, line};
2054
38
    }
2055
39
2056
40
    mcs::Log().Log(mcs::GstDebugLevelToSeverity(level), gst_debug_message_get(message), location);
2057
41
}
2058
42
}
2059
43
namespace mcs {
2060
44
Logger::Severity GstDebugLevelToSeverity(GstDebugLevel level) {
2061
45
    switch (level) {
2062
46
    case GST_LEVEL_NONE:
2063
47
    case GST_LEVEL_ERROR:
2064
48
        return Logger::Severity::kError;
2065
49
    case GST_LEVEL_WARNING:
2066
50
    case GST_LEVEL_FIXME:
2067
51
        return Logger::Severity::kWarning;
2068
52
    case GST_LEVEL_INFO:
2069
53
        return Logger::Severity::kInfo;
2070
54
    case GST_LEVEL_DEBUG:
2071
55
        return Logger::Severity::kDebug;
2072
56
    case GST_LEVEL_LOG:
2073
57
        return Logger::Severity::kDebug;
2074
58
    case GST_LEVEL_TRACE:
2075
59
    case GST_LEVEL_MEMDUMP:
2076
60
        return Logger::Severity::kTrace;
2077
61
    default:
2078
62
        return Logger::Severity::kInfo;
2079
63
    }
2080
64
}
2081
65
2082
66
void InitGstreamerOnceOrThrow() {
2083
67
    static std::atomic<bool> initialized(false);
2084
68
    if (initialized.exchange(true))
2085
69
        return;
2086
70
2087
71
    GError* error = nullptr;
2088
72
    if (gst_init_check(nullptr, nullptr, &error) == FALSE) {
2089
73
        auto what = Utils::Sprintf("Failed to initialize gstreamer (%s: %s)", g_quark_to_string(error->domain), error->message);
2090
74
        g_error_free(error);
2091
75
        throw std::runtime_error{what};
2092
76
    }
2093
77
2094
78
    // Get rid of gstreamer's default log function.
2095
79
    gst_debug_remove_log_function(nullptr);
2096
80
    // And install our own.
2097
81
    gst_debug_add_log_function(GstLog, nullptr, nullptr);
2098
82
    // No need to, our logging infra takes care of that, too.
2099
83
    gst_debug_set_colored(FALSE);
2100
84
    auto gst_debug = Utils::GetEnvValue("AETHERCAST_GST_DEBUG");
2101
85
    if (not gst_debug.empty())
2102
86
        gst_debug_set_threshold_from_string(gst_debug.c_str(), FALSE);
2103
87
}
2104
88
}
2105
0
89
2106
=== added file 'src/mcs/initgstreameronce.h'
2107
--- src/mcs/initgstreameronce.h	1970-01-01 00:00:00 +0000
2108
+++ src/mcs/initgstreameronce.h	2016-02-25 12:47:02 +0000
2109
@@ -0,0 +1,29 @@
2110
1
/*
2111
2
 * Copyright (C) 2015 Canonical, Ltd.
2112
3
 *
2113
4
 * This program is free software: you can redistribute it and/or modify it
2114
5
 * under the terms of the GNU General Public License version 3, as published
2115
6
 * by the Free Software Foundation.
2116
7
 *
2117
8
 * This program is distributed in the hope that it will be useful, but
2118
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
2119
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
2120
11
 * PURPOSE.  See the GNU General Public License for more details.
2121
12
 *
2122
13
 * You should have received a copy of the GNU General Public License along
2123
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2124
15
 *
2125
16
 */
2126
17
2127
18
#include <gst/gst.h>
2128
19
2129
20
#include "logger.h"
2130
21
2131
22
namespace mcs {
2132
23
// GstDebugLevelToSeverity maps a GstDebugLevel to a Logger::Severity;
2133
24
Logger::Severity GstDebugLevelToSeverity(GstDebugLevel);
2134
25
2135
26
// InitGstreamerOnceOrThrow initializes GStreamer, redirecting
2136
27
// its debug output to the mcs::Logger facilities.
2137
28
void InitGstreamerOnceOrThrow();
2138
29
}
2139
0
30
2140
=== modified file 'src/mcs/logger.cpp'
2141
--- src/mcs/logger.cpp	2015-12-09 07:37:10 +0000
2142
+++ src/mcs/logger.cpp	2016-02-25 12:47:02 +0000
2143
@@ -15,6 +15,8 @@
2144
15
 *
15
 *
2145
16
 */
16
 */
2146
17
17
2147
18
#include <thread>
2148
19
2149
18
#include "logger.h"
20
#include "logger.h"
2150
19
21
2151
20
#define BOOST_LOG_DYN_LINK
22
#define BOOST_LOG_DYN_LINK
2152
@@ -34,7 +36,14 @@
2153
34
}
36
}
2154
35
37
2155
36
struct BoostLogLogger : public mcs::Logger {
38
struct BoostLogLogger : public mcs::Logger {
2157
37
    BoostLogLogger() {
39
    BoostLogLogger() :
2158
40
        initialized_(false) {
2159
41
    }
2160
42
2161
43
    void Init(const mcs::Logger::Severity &severity = mcs::Logger::Severity::kWarning) override {
2162
44
        if (initialized_)
2163
45
            return;
2164
46
2165
38
        boost::log::formatter formatter = boost::log::expressions::stream
47
        boost::log::formatter formatter = boost::log::expressions::stream
2166
39
            << "[" << attrs::Severity << " "
48
            << "[" << attrs::Severity << " "
2167
40
            << boost::log::expressions::format_date_time< boost::posix_time::ptime >("Timestamp", "%Y-%m-%d %H:%M:%S")
49
            << boost::log::expressions::format_date_time< boost::posix_time::ptime >("Timestamp", "%Y-%m-%d %H:%M:%S")
2168
@@ -48,10 +57,16 @@
2169
48
        boost::log::core::get()->remove_all_sinks();
57
        boost::log::core::get()->remove_all_sinks();
2170
49
        auto logger = boost::log::add_console_log(std::cout);
58
        auto logger = boost::log::add_console_log(std::cout);
2171
50
        logger->set_formatter(formatter);
59
        logger->set_formatter(formatter);
2173
51
        // logger->set_filter(attrs::Severity < mcs::Logger::Severity::kInfo);
60
2174
61
        // logger->set_filter(attrs::Severity < severity);
2175
62
2176
63
        initialized_ = true;
2177
52
    }
64
    }
2178
53
65
2179
54
    void Log(Severity severity, const std::string& message, const boost::optional<Location> &loc) {
66
    void Log(Severity severity, const std::string& message, const boost::optional<Location> &loc) {
2180
67
        if (!initialized_)
2181
68
            Init();
2182
69
2183
55
        if (auto rec = boost::log::trivial::logger::get().open_record()) {
70
        if (auto rec = boost::log::trivial::logger::get().open_record()) {
2184
56
            boost::log::record_ostream out{rec};
71
            boost::log::record_ostream out{rec};
2185
57
            out << boost::log::add_value(attrs::Severity, severity)
72
            out << boost::log::add_value(attrs::Severity, severity)
2186
@@ -68,6 +83,9 @@
2187
68
            boost::log::trivial::logger::get().push_record(std::move(rec));
83
            boost::log::trivial::logger::get().push_record(std::move(rec));
2188
69
        }
84
        }
2189
70
    }
85
    }
2190
86
2191
87
private:
2192
88
    bool initialized_;
2193
71
};
89
};
2194
72
90
2195
73
std::shared_ptr<mcs::Logger>& MutableInstance() {
91
std::shared_ptr<mcs::Logger>& MutableInstance() {
2196
74
92
2197
=== modified file 'src/mcs/logger.h'
2198
--- src/mcs/logger.h	2015-12-09 07:31:06 +0000
2199
+++ src/mcs/logger.h	2016-02-25 12:47:02 +0000
2200
@@ -48,6 +48,8 @@
2201
48
        std::uint32_t line; // The line in file that resulted in the log message.
48
        std::uint32_t line; // The line in file that resulted in the log message.
2202
49
    };
49
    };
2203
50
50
2204
51
    virtual void Init(const mcs::Logger::Severity &severity = mcs::Logger::Severity::kWarning) = 0;
2205
52
2206
51
    virtual void Log(Severity severity, const std::string &message, const boost::optional<Location>& location) = 0;
53
    virtual void Log(Severity severity, const std::string &message, const boost::optional<Location>& location) = 0;
2207
52
54
2208
53
    virtual void Trace(const std::string& message, const boost::optional<Location>& location = boost::optional<Location>{});
55
    virtual void Trace(const std::string& message, const boost::optional<Location>& location = boost::optional<Location>{});
2209
@@ -57,6 +59,7 @@
2210
57
    virtual void Error(const std::string& message, const boost::optional<Location>& location = boost::optional<Location>{});
59
    virtual void Error(const std::string& message, const boost::optional<Location>& location = boost::optional<Location>{});
2211
58
    virtual void Fatal(const std::string& message, const boost::optional<Location>& location = boost::optional<Location>{});
60
    virtual void Fatal(const std::string& message, const boost::optional<Location>& location = boost::optional<Location>{});
2212
59
61
2213
62
2214
60
    template<typename... T>
63
    template<typename... T>
2215
61
    void Tracef(const boost::optional<Location>& location, const std::string& pattern, T&&...args) {
64
    void Tracef(const boost::optional<Location>& location, const std::string& pattern, T&&...args) {
2216
62
        Trace(Utils::Sprintf(pattern, std::forward<T>(args)...), location);
65
        Trace(Utils::Sprintf(pattern, std::forward<T>(args)...), location);
2217
63
66
2218
=== modified file 'src/mcs/mediamanagerfactory.cpp'
2219
--- src/mcs/mediamanagerfactory.cpp	2016-01-04 07:52:54 +0000
2220
+++ src/mcs/mediamanagerfactory.cpp	2016-02-25 12:47:02 +0000
2221
@@ -19,7 +19,7 @@
2222
19
19
2223
20
#include "logger.h"
20
#include "logger.h"
2224
21
#include "mediamanagerfactory.h"
21
#include "mediamanagerfactory.h"
2226
22
#include "mirsourcemediamanager.h"
22
#include "mir/sourcemediamanager.h"
2227
23
#include "x11sourcemediamanager.h"
23
#include "x11sourcemediamanager.h"
2228
24
#include "testsourcemediamanager.h"
24
#include "testsourcemediamanager.h"
2229
25
#include "utils.h"
25
#include "utils.h"
2230
@@ -41,19 +41,23 @@
2231
41
41
2232
42
bool NullSourceMediaManager::IsPaused() const {
42
bool NullSourceMediaManager::IsPaused() const {
2233
43
    WARNING("NullSourceMediaManager: Not implemented");
43
    WARNING("NullSourceMediaManager: Not implemented");
2234
44
    return false;
2235
44
}
45
}
2236
45
46
2238
46
void NullSourceMediaManager::Configure() {
47
bool NullSourceMediaManager::Configure() {
2239
47
    WARNING("NullSourceMediaManager: Not implemented");
48
    WARNING("NullSourceMediaManager: Not implemented");
2240
49
    return false;
2241
48
}
50
}
2242
49
51
2243
50
std::shared_ptr<BaseSourceMediaManager> MediaManagerFactory::CreateSource(const std::string &remote_address) {
52
std::shared_ptr<BaseSourceMediaManager> MediaManagerFactory::CreateSource(const std::string &remote_address) {
2244
51
    std::string type = Utils::GetEnvValue("MIRACAST_SOURCE_TYPE");
53
    std::string type = Utils::GetEnvValue("MIRACAST_SOURCE_TYPE");
2245
54
    if (type.length() == 0)
2246
55
        type = "mir";
2247
52
56
2248
53
    DEBUG("Creating source media manager of type %s", type.c_str());
57
    DEBUG("Creating source media manager of type %s", type.c_str());
2249
54
58
2252
55
    if (type.length() == 0 || type == "mir")
59
    if (type == "mir")
2253
56
        return std::make_shared<MirSourceMediaManager>(remote_address);
60
        return mcs::mir::SourceMediaManager::Create(remote_address);
2254
57
    else if (type == "x11")
61
    else if (type == "x11")
2255
58
        return X11SourceMediaManager::create(remote_address);
62
        return X11SourceMediaManager::create(remote_address);
2256
59
    else if (type == "test")
63
    else if (type == "test")
2257
60
64
2258
=== modified file 'src/mcs/mediamanagerfactory.h'
2259
--- src/mcs/mediamanagerfactory.h	2015-12-02 15:13:13 +0000
2260
+++ src/mcs/mediamanagerfactory.h	2016-02-25 12:47:02 +0000
2261
@@ -33,7 +33,7 @@
2262
33
    bool IsPaused() const override;
33
    bool IsPaused() const override;
2263
34
34
2264
35
protected:
35
protected:
2266
36
    void Configure() override;
36
    bool Configure() override;
2267
37
};
37
};
2268
38
38
2269
39
class MediaManagerFactory {
39
class MediaManagerFactory {
2270
40
40
2271
=== added directory 'src/mcs/mir'
2272
=== added file 'src/mcs/mir/mediasender.cpp'
2273
--- src/mcs/mir/mediasender.cpp	1970-01-01 00:00:00 +0000
2274
+++ src/mcs/mir/mediasender.cpp	2016-02-25 12:47:02 +0000
2275
@@ -0,0 +1,155 @@
2276
1
/*
2277
2
 * Copyright (C) 2015 Canonical, Ltd.
2278
3
 *
2279
4
 * This program is free software: you can redistribute it and/or modify it
2280
5
 * under the terms of the GNU General Public License version 3, as published
2281
6
 * by the Free Software Foundation.
2282
7
 *
2283
8
 * This program is distributed in the hope that it will be useful, but
2284
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
2285
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
2286
11
 * PURPOSE.  See the GNU General Public License for more details.
2287
12
 *
2288
13
 * You should have received a copy of the GNU General Public License along
2289
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2290
15
 *
2291
16
 */
2292
17
2293
18
#include <stdio.h>
2294
19
2295
20
#include "mcs/logger.h"
2296
21
2297
22
#include "mcs/video/statistics.h"
2298
23
2299
24
#include "mcs/mir/mediasender.h"
2300
25
2301
26
namespace {
2302
27
FILE *dump_file = nullptr;
2303
28
static constexpr const char *kMediaSenderThreadName{"MediaSender"};
2304
29
}
2305
30
2306
31
namespace mcs {
2307
32
namespace mir {
2308
33
2309
34
MediaSender::Ptr MediaSender::Create(const Endpoint &endpoint, const mcs::video::BaseEncoder::Config &config) {
2310
35
    return std::shared_ptr<MediaSender>(new MediaSender(endpoint, config));
2311
36
}
2312
37
2313
38
MediaSender::MediaSender(const Endpoint &endpoint, const mcs::video::BaseEncoder::Config &config) :
2314
39
    prev_time_us_(-1ll),
2315
40
    queue_(video::BufferQueue::Create()),
2316
41
    running_(false) {
2317
42
2318
43
    packetizer_ = streaming::MPEGTSPacketizer::Create();
2319
44
2320
45
    // FIXME once we add support for audio this can be only used for video
2321
46
    // and we need to differentiate here per track.
2322
47
    streaming::MPEGTSPacketizer::TrackFormat format;
2323
48
    format.profile_idc = config.profile_idc;
2324
49
    format.level_idc = config.level_idc;
2325
50
    format.constraint_set = config.constraint_set;
2326
51
    format.mime = "video/avc";
2327
52
2328
53
    video_track_ = packetizer_->AddTrack(format);
2329
54
2330
55
    rtp_sender_ = streaming::RTPSender::Create();
2331
56
    rtp_sender_->Setup(endpoint.address, endpoint.port);
2332
57
2333
58
    if (mcs::Utils::IsEnvSet("AETHERCAST_MPEGTS_DUMP"))
2334
59
        dump_file = ::fopen(mcs::Utils::GetEnvValue("AETHERCAST_MPEGTS_DUMP").c_str(), "w");
2335
60
}
2336
61
2337
62
MediaSender::~MediaSender() {
2338
63
    if (dump_file)
2339
64
        ::fclose(dump_file);
2340
65
2341
66
    Stop();
2342
67
}
2343
68
2344
69
void MediaSender::Start() {
2345
70
    if (running_)
2346
71
        return;
2347
72
2348
73
    running_ = true;
2349
74
    worker_thread_ = std::thread(&MediaSender::WorkerThread, this);
2350
75
    pthread_setname_np(worker_thread_.native_handle(), kMediaSenderThreadName);
2351
76
}
2352
77
2353
78
void MediaSender::Stop() {
2354
79
    if (!running_)
2355
80
        return;
2356
81
2357
82
    running_ = false;
2358
83
    worker_thread_.join();
2359
84
}
2360
85
2361
86
void MediaSender::ProcessBuffer(const mcs::video::Buffer::Ptr &buffer) {
2362
87
    mcs::video::Buffer::Ptr packets;
2363
88
2364
89
    static int64_t start_time_us = mcs::Utils::GetNowUs();
2365
90
    static unsigned int buffer_count = 0;
2366
91
2367
92
    buffer_count++;
2368
93
    int64_t time_now_us = mcs::Utils::GetNowUs();
2369
94
    if (start_time_us + 1000000ll <= time_now_us) {
2370
95
        video::Statistics::Instance()->RecordSenderBufferPerSecond(buffer_count);
2371
96
        buffer_count = 0;
2372
97
        start_time_us = time_now_us;
2373
98
    }
2374
99
2375
100
    // FIXME: By default we're expecting the encoder to insert SPS and PPS
2376
101
    // with each IDR frame but we need to handle also the case where the
2377
102
    // encoder is not capable of doing this.
2378
103
#if 0
2379
104
    int flags = streaming::MPEGTSPacketizer::kPrependSPSandPPStoIDRFrames;
2380
105
#else
2381
106
    int flags = 0;
2382
107
#endif
2383
108
2384
109
    // Per spec we need to emit PAT/PMT and PCR updates atleast every 100ms
2385
110
    int64_t time_us = mcs::Utils::GetNowUs();
2386
111
    if (prev_time_us_ < 0ll || prev_time_us_ + 100000ll <= time_us) {
2387
112
        flags |= streaming::MPEGTSPacketizer::kEmitPATandPMT;
2388
113
        flags |= streaming::MPEGTSPacketizer::kEmitPCR;
2389
114
        prev_time_us_ = time_us;
2390
115
    }
2391
116
2392
117
    if (!packetizer_->Packetize(video_track_, buffer, &packets, flags)) {
2393
118
        MCS_ERROR("MPEGTS packetizing failed");
2394
119
        return;
2395
120
    }
2396
121
2397
122
    if (dump_file)
2398
123
        ::fwrite(packets->Data(), 1, packets->Length(), dump_file);
2399
124
2400
125
    packets->SetTimestamp(buffer->Timestamp());
2401
126
    rtp_sender_->QueueTSPackets(packets);
2402
127
}
2403
128
2404
129
void MediaSender::WorkerThread() {
2405
130
    while (running_) {
2406
131
        // This will wait for a short time and then return back
2407
132
        // so we can loop again and check if we have to exit or
2408
133
        // not.
2409
134
        if (!queue_->WaitToBeFilled())
2410
135
            continue;
2411
136
2412
137
        auto buffer = queue_->Pop();
2413
138
        ProcessBuffer(buffer);
2414
139
    }
2415
140
}
2416
141
2417
142
void MediaSender::OnBufferAvailable(const video::Buffer::Ptr &buffer) {
2418
143
    queue_->Push(buffer);
2419
144
}
2420
145
2421
146
void MediaSender::OnBufferWithCodecConfig(const video::Buffer::Ptr &buffer) {
2422
147
    packetizer_->SubmitCSD(video_track_, buffer);
2423
148
}
2424
149
2425
150
uint16_t MediaSender::LocalRTPPort() const {
2426
151
    return rtp_sender_->LocalPort();
2427
152
}
2428
153
2429
154
} // namespace mir
2430
155
} // namespace mcs
2431
0
156
2432
=== added file 'src/mcs/mir/mediasender.h'
2433
--- src/mcs/mir/mediasender.h	1970-01-01 00:00:00 +0000
2434
+++ src/mcs/mir/mediasender.h	2016-02-25 12:47:02 +0000
2435
@@ -0,0 +1,75 @@
2436
1
/*
2437
2
 * Copyright (C) 2015 Canonical, Ltd.
2438
3
 *
2439
4
 * This program is free software: you can redistribute it and/or modify it
2440
5
 * under the terms of the GNU General Public License version 3, as published
2441
6
 * by the Free Software Foundation.
2442
7
 *
2443
8
 * This program is distributed in the hope that it will be useful, but
2444
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
2445
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
2446
11
 * PURPOSE.  See the GNU General Public License for more details.
2447
12
 *
2448
13
 * You should have received a copy of the GNU General Public License along
2449
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2450
15
 *
2451
16
 */
2452
17
2453
18
#ifndef MCS_MIR_MEDIASENDER_H_
2454
19
#define MCS_MIR_MEDIASENDER_H_
2455
20
2456
21
#include <memory>
2457
22
#include <mutex>
2458
23
2459
24
#include "mcs/video/baseencoder.h"
2460
25
#include "mcs/video/bufferqueue.h"
2461
26
2462
27
#include "mcs/streaming/mpegtspacketizer.h"
2463
28
#include "mcs/streaming/rtpsender.h"
2464
29
2465
30
namespace mcs {
2466
31
namespace mir {
2467
32
2468
33
class MediaSender : public std::enable_shared_from_this<MediaSender>,
2469
34
                    public mcs::video::BaseEncoder::Delegate {
2470
35
public:
2471
36
    typedef std::shared_ptr<MediaSender> Ptr;
2472
37
2473
38
    struct Endpoint {
2474
39
        std::string address;
2475
40
        unsigned int port;
2476
41
    };
2477
42
2478
43
    static Ptr Create(const Endpoint &endpoint, const mcs::video::BaseEncoder::Config &config);
2479
44
2480
45
    ~MediaSender();
2481
46
2482
47
    void Start();
2483
48
    void Stop();
2484
49
2485
50
    void OnBufferAvailable(const mcs::video::Buffer::Ptr &buffer) override;
2486
51
    void OnBufferWithCodecConfig(const mcs::video::Buffer::Ptr &buffer) override;
2487
52
2488
53
    uint16_t LocalRTPPort() const;
2489
54
2490
55
private:
2491
56
    MediaSender(const Endpoint &endpoint, const mcs::video::BaseEncoder::Config &config);
2492
57
2493
58
    void WorkerThread();
2494
59
2495
60
    void ProcessBuffer(const mcs::video::Buffer::Ptr &buffer);
2496
61
2497
62
private:
2498
63
    streaming::MPEGTSPacketizer::Ptr packetizer_;
2499
64
    streaming::RTPSender::Ptr rtp_sender_;
2500
65
    streaming::MPEGTSPacketizer::TrackId video_track_;
2501
66
    int64_t prev_time_us_;
2502
67
    std::thread worker_thread_;
2503
68
    mcs::video::BufferQueue::Ptr queue_;
2504
69
    bool running_;
2505
70
};
2506
71
2507
72
} // namespace mir
2508
73
} // namespace mcs
2509
74
2510
75
#endif
2511
0
76
2512
=== renamed file 'src/mcs/mirsourcemediamanager.cpp' => 'src/mcs/mir/sourcemediamanager.cpp'
2513
--- src/mcs/mirsourcemediamanager.cpp	2015-12-07 16:02:43 +0000
2514
+++ src/mcs/mir/sourcemediamanager.cpp	2016-02-25 12:47:02 +0000
2515
@@ -15,99 +15,136 @@
2516
15
 *
15
 *
2517
16
 */
16
 */
2518
17
17
2524
18
#include <sstream>
18
#include "mcs/logger.h"
2525
19
19
2526
20
#include "mirsourcemediamanager.h"
20
#include "mcs/video/statistics.h"
2527
21
#include "utils.h"
21
#include "mcs/video/videoformat.h"
2528
22
#include "logger.h"
22
2529
23
#include "mcs/mir/sourcemediamanager.h"
2530
24
2531
25
#include "mcs/android/h264encoder.h"
2532
23
26
2533
24
namespace mcs {
27
namespace mcs {
2622
25
MirSourceMediaManager::MirSourceMediaManager(const std::string &remote_address) :
28
namespace mir {
2623
26
    remote_address_(remote_address) {
29
2624
27
}
30
SourceMediaManager::Ptr SourceMediaManager::Create(const std::string &remote_address) {
2625
28
31
    return std::shared_ptr<SourceMediaManager>(new SourceMediaManager(remote_address));
2626
29
MirSourceMediaManager::~MirSourceMediaManager() {
32
}
2627
30
}
33
2628
31
34
SourceMediaManager::SourceMediaManager(const std::string &remote_address) :
2629
32
SharedGObject<GstElement> MirSourceMediaManager::ConstructPipeline(const wds::H264VideoFormat &format) {
35
    remote_address_(remote_address),
2630
33
    int width = 0, height = 0;
36
    state_(State::Stopped) {
2631
34
    std::string profile = "constrained-baseline";
37
}
2632
35
38
2633
36
    switch (format.profile) {
39
SourceMediaManager::~SourceMediaManager() {
2634
37
    case wds::CBP:
40
    if (state_ != State::Stopped)
2635
38
        profile = "constrained-baseline";
41
        StopPipeline();
2636
39
        break;
42
2637
40
    case wds::CHP:
43
    mcs::video::Statistics::Instance()->Dump();
2638
41
        profile = "high";
44
}
2639
42
        break;
45
2640
43
    }
46
bool SourceMediaManager::Configure() {
2641
44
47
    auto rr = mcs::video::ExtractRateAndResolution(format_);
2642
45
    switch (format.type) {
48
2643
46
    case wds::CEA:
49
    MCS_DEBUG("dimensions: %dx%d@%d", rr.width, rr.height, rr.framerate);
2644
47
        switch (format.rate_resolution) {
50
2645
48
        case wds::CEA640x480p60:
51
    // FIXME we don't support any other mode than extend for now as that means some
2646
49
            width = 640;
52
    // additional work from mir to still give us properly sized frames we can hand
2647
50
            height = 480;
53
    // to the encoder.
2648
51
            break;
54
    StreamConnector::DisplayOutput output{StreamConnector::DisplayMode::kExtend, rr.width, rr.height};
2649
52
        case wds::CEA720x480p60:
55
2650
53
        case wds::CEA720x480i60:
56
    connector_ = mcs::mir::StreamConnector::Create(output);
2651
54
            width = 720;
57
    if (!connector_->IsValid())
2652
55
            height = 480;
58
        return false;
2653
56
            break;
59
2654
57
        case wds::CEA720x576p50:
60
    encoder_ = mcs::android::H264Encoder::Create();
2655
58
        case wds::CEA720x576i50:
61
2656
59
            width = 720;
62
    int profile = 0, level = 0, constraint = 0;
2657
60
            height = 576;
63
    mcs::video::ExtractProfileLevel(format_, &profile, &level, &constraint);
2658
61
            break;
64
2659
62
        case wds::CEA1280x720p30:
65
    auto config = mcs::android::H264Encoder::DefaultConfiguration();
2660
63
        case wds::CEA1280x720p60:
66
    config.width = rr.width;
2661
64
            width = 1280;
67
    config.height = rr.height;
2662
65
            height = 720;
68
    config.framerate = rr.framerate;
2663
66
            break;
69
    config.profile_idc = profile;
2664
67
        case wds::CEA1920x1080p30:
70
    config.level_idc = level;
2665
68
        case wds::CEA1920x1080p60:
71
    config.constraint_set = constraint;
2666
69
        case wds::CEA1920x1080i60:
72
2667
70
            width = 1920;
73
    if (!encoder_->Configure(config))
2668
71
            height = 1080;
74
        return false;
2669
72
            break;
75
2670
73
        case wds::CEA1280x720p25:
76
    encoder_->Start();
2671
74
        case wds::CEA1280x720p50:
77
2672
75
        case wds::CEA1280x720p24:
78
    renderer_ = mcs::mir::StreamRenderer::Create(connector_, encoder_);
2673
76
            width = 1280;
79
    renderer_->SetDimensions(rr.width, rr.height);
2674
77
            height = 720;
80
2675
78
            break;
81
    sender_ = mcs::mir::MediaSender::Create(MediaSender::Endpoint{remote_address_, sink_port1_}, config);
2676
79
        case wds::CEA1920x1080p25:
82
    encoder_->SetDelegate(sender_);
2677
80
        case wds::CEA1920x1080p50:
83
2678
81
        case wds::CEA1920x1080i50:
84
    return true;
2679
82
        case wds::CEA1920x1080p24:
85
}
2680
83
            width = 1920;
86
2681
84
            height = 1080;
87
void SourceMediaManager::StartPipeline() {
2682
85
            break;
88
    sender_->Start();
2683
86
        default:
89
    encoder_->Start();
2684
87
            break;
90
    renderer_->StartThreaded();
2685
88
        }
91
}
2686
89
        break;
92
2687
90
    default:
93
void SourceMediaManager::StopPipeline() {
2688
91
        break;
94
    renderer_->Stop();
2689
92
    }
95
    encoder_->Stop();
2690
93
96
    sender_->Stop();
2691
94
    std::stringstream ss;
97
}
2692
95
    ss << "mirimagesrc mir-socket=/run/mir_socket ! videoconvert ! videoscale ! ";
98
2693
96
    ss << Utils::Sprintf("video/x-raw,width=%d,height=%d ! ", width, height);
99
void SourceMediaManager::Play() {
2694
97
    ss << "videoflip method=counterclockwise ! queue2 ! video/x-raw,format=I420 ! ";
100
    if (!IsPaused() || !renderer_)
2695
98
    ss << "x264enc aud=false byte-stream=true tune=zerolatency ! ";
101
        return;
2696
99
    ss << Utils::Sprintf("video/x-h264,profile=%s ! ", profile.c_str());
102
2697
100
    ss << "mpegtsmux ! rtpmp2tpay ! ";
103
    MCS_DEBUG("");
2698
101
    ss << Utils::Sprintf("udpsink name=sink host=%s port=%d", remote_address_.c_str(), sink_port1_);
104
2699
102
105
    StartPipeline();
2700
103
    GError *error = nullptr;
106
2701
104
    GstElement *pipeline = gst_parse_launch(ss.str().c_str(), &error);
107
    state_ = State::Playing;
2702
105
    if (error) {
108
}
2703
106
        ERROR("Failed to setup GStreamer pipeline: %s", error->message);
109
2704
107
        g_error_free(error);
110
void SourceMediaManager::Pause() {
2705
108
        return nullptr;
111
    if (IsPaused()|| !renderer_)
2706
109
    }
112
        return;
2707
110
113
2708
111
    return make_shared_gobject(pipeline);
114
    MCS_DEBUG("");
2709
112
}
115
2710
116
    StopPipeline();
2711
117
2712
118
    state_ = State::Paused;
2713
119
}
2714
120
2715
121
void SourceMediaManager::Teardown() {
2716
122
    if (state_ == State::Stopped || !renderer_)
2717
123
        return;
2718
124
2719
125
    MCS_DEBUG("");
2720
126
2721
127
    StopPipeline();
2722
128
2723
129
    state_ = State::Stopped;
2724
130
}
2725
131
2726
132
bool SourceMediaManager::IsPaused() const {
2727
133
    return state_ == State::Paused ||
2728
134
           state_ == State::Stopped;
2729
135
}
2730
136
2731
137
void SourceMediaManager::SendIDRPicture() {
2732
138
    if (!encoder_)
2733
139
        return;
2734
140
2735
141
    encoder_->SendIDRFrame();
2736
142
}
2737
143
2738
144
int SourceMediaManager::GetLocalRtpPort() const {
2739
145
    MCS_DEBUG("local port %d", sender_->LocalRTPPort());
2740
146
    return sender_->LocalRTPPort();
2741
147
}
2742
148
2743
149
} // namespace mir
2744
113
} // namespace mcs
150
} // namespace mcs
2745
114
151
2746
=== renamed file 'src/mcs/mirsourcemediamanager.h' => 'src/mcs/mir/sourcemediamanager.h'
2747
--- src/mcs/mirsourcemediamanager.h	2015-11-30 10:41:56 +0000
2748
+++ src/mcs/mir/sourcemediamanager.h	2016-02-25 12:47:02 +0000
2749
@@ -15,22 +15,64 @@
2750
15
 *
15
 *
2751
16
 */
16
 */
2752
17
17
2757
18
#ifndef MIRMEDIAMANAGER_H_
18
#ifndef MCS_MIR_SOURCEMEDIAMANAGERNEXT_H_
2758
19
#define MIRMEDIAMANAGER_H_
19
#define MCS_MIR_SOURCEMEDIAMANAGERNEXT_H_
2759
20
20
2760
21
#include "gstsourcemediamanager.h"
21
#include <memory>
2761
22
2762
23
#include "mcs/basesourcemediamanager.h"
2763
24
2764
25
#include "mcs/video/baseencoder.h"
2765
26
2766
27
#include "mcs/mir/streamconnector.h"
2767
28
#include "mcs/mir/streamrenderer.h"
2768
29
#include "mcs/mir/mediasender.h"
2769
22
30
2770
23
namespace mcs {
31
namespace mcs {
2772
24
class MirSourceMediaManager : public GstSourceMediaManager {
32
namespace mir {
2773
33
2774
34
class SourceMediaManager : public mcs::BaseSourceMediaManager {
2775
25
public:
35
public:
2778
26
    explicit MirSourceMediaManager(const std::string &remote_address);
36
    typedef std::shared_ptr<SourceMediaManager> Ptr;
2779
27
    ~MirSourceMediaManager();
37
2780
38
    enum class State {
2781
39
        Playing,
2782
40
        Paused,
2783
41
        Stopped
2784
42
    };
2785
43
2786
44
    static Ptr Create(const std::string &remote_address);
2787
45
2788
46
    ~SourceMediaManager();
2789
47
2790
48
    void Play() override;
2791
49
    void Pause() override;
2792
50
    void Teardown() override;
2793
51
    bool IsPaused() const override;
2794
52
2795
53
    void SendIDRPicture() override;
2796
54
2797
55
    int GetLocalRtpPort() const override;
2798
56
2799
57
private:
2800
58
    SourceMediaManager(const std::string &remote_address);
2801
59
2802
60
    void StartPipeline();
2803
61
    void StopPipeline();
2804
28
62
2805
29
protected:
63
protected:
2807
30
    SharedGObject<GstElement> ConstructPipeline(const wds::H264VideoFormat &format) override;
64
    bool Configure() override;
2808
31
65
2809
32
private:
66
private:
2810
33
    std::string remote_address_;
67
    std::string remote_address_;
2811
68
    State state_;
2812
69
    mcs::video::BaseEncoder::Ptr encoder_;
2813
70
    mcs::mir::StreamConnector::Ptr connector_;
2814
71
    mcs::mir::StreamRenderer::Ptr renderer_;
2815
72
    mcs::mir::MediaSender::Ptr sender_;
2816
34
};
73
};
2817
74
2818
75
} // namespace mir
2819
35
} // namespace mcs
76
} // namespace mcs
2820
77
2821
36
#endif
78
#endif
2822
37
79
2823
=== added file 'src/mcs/mir/streamconnector.cpp'
2824
--- src/mcs/mir/streamconnector.cpp	1970-01-01 00:00:00 +0000
2825
+++ src/mcs/mir/streamconnector.cpp	2016-02-25 12:47:02 +0000
2826
@@ -0,0 +1,204 @@
2827
1
/*
2828
2
 * Copyright (C) 2015 Canonical, Ltd.
2829
3
 *
2830
4
 * This program is free software: you can redistribute it and/or modify it
2831
5
 * under the terms of the GNU General Public License version 3, as published
2832
6
 * by the Free Software Foundation.
2833
7
 *
2834
8
 * This program is distributed in the hope that it will be useful, but
2835
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
2836
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
2837
11
 * PURPOSE.  See the GNU General Public License for more details.
2838
12
 *
2839
13
 * You should have received a copy of the GNU General Public License along
2840
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2841
15
 *
2842
16
 */
2843
17
2844
18
#include <boost/concept_check.hpp>
2845
19
2846
20
#include "mcs/logger.h"
2847
21
#include "mcs/mir/streamconnector.h"
2848
22
2849
23
namespace {
2850
24
static constexpr const char *kMirSocket{"/run/mir_socket"};
2851
25
static constexpr const char *kMirConnectionName{"aethercast screencast client"};
2852
26
}
2853
27
2854
28
namespace mcs {
2855
29
namespace mir {
2856
30
2857
31
std::string StreamConnector::DisplayModeToString(const DisplayMode &mode) {
2858
32
    switch (mode) {
2859
33
    case DisplayMode::kExtend:
2860
34
        return "extend";
2861
35
    case DisplayMode::kMirror:
2862
36
        return "mirror";
2863
37
    default:
2864
38
        break;
2865
39
    }
2866
40
    return "unknown";
2867
41
}
2868
42
2869
43
StreamConnector::Ptr StreamConnector::Create(const StreamConnector::DisplayOutput &output) {
2870
44
    return std::shared_ptr<StreamConnector>(new StreamConnector(output));
2871
45
}
2872
46
2873
47
StreamConnector::StreamConnector(const StreamConnector::DisplayOutput &output) :
2874
48
    output_(output) {
2875
49
    connection_ = mir_connect_sync(kMirSocket, kMirConnectionName);
2876
50
    if (!mir_connection_is_valid(connection_)) {
2877
51
        MCS_ERROR("Failed to connect to Mir server: %s",
2878
52
                  mir_connection_get_error_message(connection_));
2879
53
        return;
2880
54
    }
2881
55
2882
56
    auto config = mir_connection_create_display_config(connection_);
2883
57
2884
58
    MirDisplayOutput *active_output = nullptr;
2885
59
    int output_index = 0;
2886
60
2887
61
    for (unsigned int i = 0; i < config->num_outputs; ++i) {
2888
62
        if (config->outputs[i].connected &&
2889
63
            config->outputs[i].used &&
2890
64
            config->outputs[i].current_mode < config->outputs[i].num_modes) {
2891
65
            // Found an active connection we can just use for our purpose
2892
66
            active_output = &config->outputs[i];
2893
67
            output_index = i;
2894
68
            break;
2895
69
        }
2896
70
    }
2897
71
2898
72
    if (!active_output) {
2899
73
        MCS_ERROR("Failed to find a suitable display output");
2900
74
        return;
2901
75
    }
2902
76
2903
77
    const MirDisplayMode *display_mode = &active_output->modes[active_output->current_mode];
2904
78
2905
79
    params_.height = display_mode->vertical_resolution;
2906
80
    params_.width = display_mode->horizontal_resolution;
2907
81
2908
82
    if (output_.mode == DisplayMode::kMirror) {
2909
83
        params_.region.left = 0;
2910
84
        params_.region.top = 0;
2911
85
        params_.region.width = params_.width;
2912
86
        params_.region.height = params_.height;
2913
87
2914
88
        output_.width = params_.width;
2915
89
        output_.height = params_.height;
2916
90
    }
2917
91
    else if (output_.mode == DisplayMode::kExtend) {
2918
92
        // If we request a screen region outside the available screen area
2919
93
        // mir will create a mir output which is then available for everyone
2920
94
        // as just another display.
2921
95
        params_.region.left = params_.width;
2922
96
        params_.region.top = 0;
2923
97
        params_.region.width = output_.width;
2924
98
        params_.region.height = output_.height;
2925
99
2926
100
        params_.width = output_.width;
2927
101
        params_.height = output_.height;
2928
102
    }
2929
103
2930
104
    output_.refresh_rate = display_mode->refresh_rate;
2931
105
2932
106
    MCS_INFO("Selected output ID %i [(%ix%i)+(%ix%i)] orientation %d",
2933
107
             output_index,
2934
108
             params_.width, params_.height,
2935
109
             params_.region.left, params_.region.top,
2936
110
             active_output->orientation);
2937
111
2938
112
    MCS_DEBUG("Setting up screencast [%s %dx%d]",
2939
113
              DisplayModeToString(output_.mode),
2940
114
              output_.width,
2941
115
              output_.height);
2942
116
2943
117
    unsigned int num_pixel_formats = 0;
2944
118
    mir_connection_get_available_surface_formats(connection_, &params_.pixel_format,
2945
119
                                                 1, &num_pixel_formats);
2946
120
    if (num_pixel_formats == 0) {
2947
121
        MCS_ERROR("Failed to find suitable pixel format: %s",
2948
122
                  mir_connection_get_error_message(connection_));
2949
123
        return;
2950
124
    }
2951
125
2952
126
    screencast_ = mir_connection_create_screencast_sync(connection_, &params_);
2953
127
    if (!screencast_) {
2954
128
        MCS_ERROR("Failed to create Mir screencast: %s",
2955
129
                  mir_connection_get_error_message(connection_));
2956
130
        return;
2957
131
    }
2958
132
2959
133
    buffer_stream_ = mir_screencast_get_buffer_stream(screencast_);
2960
134
    if (!buffer_stream_) {
2961
135
        MCS_ERROR("Failed to setup Mir buffer stream");
2962
136
        return;
2963
137
    }
2964
138
2965
139
    auto platform_type = mir_buffer_stream_get_platform_type(buffer_stream_);
2966
140
    if (platform_type != mir_platform_type_android) {
2967
141
        MCS_ERROR("Not running with android platform: This is not supported.");
2968
142
        mir_buffer_stream_release_sync(buffer_stream_);
2969
143
        buffer_stream_ = nullptr;
2970
144
        return;
2971
145
    }
2972
146
}
2973
147
2974
148
StreamConnector::~StreamConnector() {
2975
149
    if (screencast_)
2976
150
        mir_screencast_release_sync(screencast_);
2977
151
2978
152
    if (connection_)
2979
153
        mir_connection_release(connection_);
2980
154
}
2981
155
2982
156
void StreamConnector::SwapBuffersSync() {
2983
157
    if (!buffer_stream_)
2984
158
        return;
2985
159
2986
160
    mir_buffer_stream_swap_buffers_sync(buffer_stream_);
2987
161
}
2988
162
2989
163
void StreamConnector::SwapBuffers() {
2990
164
    if (!buffer_stream_)
2991
165
        return;
2992
166
2993
167
    mir_buffer_stream_swap_buffers(buffer_stream_, [](MirBufferStream *stream, void *client_context) {
2994
168
        boost::ignore_unused_variable_warning(stream);
2995
169
        boost::ignore_unused_variable_warning(client_context);
2996
170
2997
171
        MCS_DEBUG("Buffers are swapped now");
2998
172
2999
173
    }, nullptr);
3000
174
}
3001
175
3002
176
bool StreamConnector::IsValid() const {
3003
177
    return connection_ && screencast_ &&  buffer_stream_;
3004
178
}
3005
179
3006
180
void* StreamConnector::NativeWindowHandle() const {
3007
181
    if (!buffer_stream_)
3008
182
        return nullptr;
3009
183
3010
184
    return reinterpret_cast<void*>(mir_buffer_stream_get_egl_native_window(buffer_stream_));
3011
185
}
3012
186
3013
187
void* StreamConnector::NativeDisplayHandle() const {
3014
188
    if (!connection_)
3015
189
        return nullptr;
3016
190
3017
191
    return mir_connection_get_egl_native_display(connection_);
3018
192
}
3019
193
3020
194
StreamConnector::DisplayOutput StreamConnector::OutputMode() const {
3021
195
    return output_;
3022
196
}
3023
197
3024
198
MirNativeBuffer* StreamConnector::CurrentBuffer() const {
3025
199
    MirNativeBuffer *buffer = nullptr;
3026
200
    mir_buffer_stream_get_current_buffer(buffer_stream_, &buffer);
3027
201
    return buffer;
3028
202
}
3029
203
} // namespace mir
3030
204
} // namespace mcs
3031
0
205
3032
=== added file 'src/mcs/mir/streamconnector.h'
3033
--- src/mcs/mir/streamconnector.h	1970-01-01 00:00:00 +0000
3034
+++ src/mcs/mir/streamconnector.h	2016-02-25 12:47:02 +0000
3035
@@ -0,0 +1,77 @@
3036
1
/*
3037
2
 * Copyright (C) 2015 Canonical, Ltd.
3038
3
 *
3039
4
 * This program is free software: you can redistribute it and/or modify it
3040
5
 * under the terms of the GNU General Public License version 3, as published
3041
6
 * by the Free Software Foundation.
3042
7
 *
3043
8
 * This program is distributed in the hope that it will be useful, but
3044
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3045
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3046
11
 * PURPOSE.  See the GNU General Public License for more details.
3047
12
 *
3048
13
 * You should have received a copy of the GNU General Public License along
3049
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3050
15
 *
3051
16
 */
3052
17
3053
18
#ifndef MCS_MIR_CONNECTOR_H_
3054
19
#define MCS_MIR_CONNECTOR_H_
3055
20
3056
21
#include <memory>
3057
22
3058
23
#include <mir_toolkit/mir_client_library.h>
3059
24
#include <mir_toolkit/mir_screencast.h>
3060
25
#include <mir_toolkit/mir_buffer_stream.h>
3061
26
3062
27
namespace mcs {
3063
28
namespace mir {
3064
29
3065
30
class StreamConnector {
3066
31
public:
3067
32
    typedef std::shared_ptr<StreamConnector> Ptr;
3068
33
3069
34
    enum class DisplayMode {
3070
35
        kMirror,
3071
36
        kExtend
3072
37
    };
3073
38
3074
39
    static std::string DisplayModeToString(const DisplayMode &mode);
3075
40
3076
41
    struct DisplayOutput {
3077
42
        DisplayMode mode;
3078
43
        unsigned int width;
3079
44
        unsigned int height;
3080
45
        double refresh_rate;
3081
46
    };
3082
47
3083
48
    static Ptr Create(const DisplayOutput &output);
3084
49
3085
50
    ~StreamConnector();
3086
51
3087
52
    void SwapBuffers();
3088
53
    void SwapBuffersSync();
3089
54
3090
55
    bool IsValid() const;
3091
56
3092
57
    void* NativeWindowHandle() const;
3093
58
    void* NativeDisplayHandle() const;
3094
59
3095
60
    DisplayOutput OutputMode() const;
3096
61
    MirNativeBuffer* CurrentBuffer() const;
3097
62
3098
63
private:
3099
64
    StreamConnector(const DisplayOutput &output);
3100
65
3101
66
private:
3102
67
    MirConnection *connection_;
3103
68
    MirScreencast *screencast_;
3104
69
    MirBufferStream *buffer_stream_;
3105
70
    MirScreencastParameters params_;
3106
71
    DisplayOutput output_;
3107
72
};
3108
73
3109
74
} // namespace mir
3110
75
} // namespace mcs
3111
76
3112
77
#endif
3113
0
78
3114
=== added file 'src/mcs/mir/streamrenderer.cpp'
3115
--- src/mcs/mir/streamrenderer.cpp	1970-01-01 00:00:00 +0000
3116
+++ src/mcs/mir/streamrenderer.cpp	2016-02-25 12:47:02 +0000
3117
@@ -0,0 +1,175 @@
3118
1
/*
3119
2
 * Copyright (C) 2015 Canonical, Ltd.
3120
3
 *
3121
4
 * This program is free software: you can redistribute it and/or modify it
3122
5
 * under the terms of the GNU General Public License version 3, as published
3123
6
 * by the Free Software Foundation.
3124
7
 *
3125
8
 * This program is distributed in the hope that it will be useful, but
3126
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3127
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3128
11
 * PURPOSE.  See the GNU General Public License for more details.
3129
12
 *
3130
13
 * You should have received a copy of the GNU General Public License along
3131
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3132
15
 *
3133
16
 */
3134
17
3135
18
#define GL_GLEXT_PROTOTYPES
3136
19
#define EGL_EGLEXT_PROTOTYPES
3137
20
#include <EGL/egl.h>
3138
21
#include <EGL/eglext.h>
3139
22
#include <GLES2/gl2.h>
3140
23
#include <GLES2/gl2ext.h>
3141
24
3142
25
#include <system/window.h>
3143
26
3144
27
#include <chrono>
3145
28
#include <thread>
3146
29
3147
30
#include <boost/concept_check.hpp>
3148
31
3149
32
#include "mcs/logger.h"
3150
33
3151
34
#include "mcs/video/statistics.h"
3152
35
3153
36
#include "mcs/mir/streamconnector.h"
3154
37
#include "mcs/mir/streamrenderer.h"
3155
38
3156
39
namespace {
3157
40
static constexpr const char *kStreamRendererThreadName{"StreamRenderer"};
3158
41
static constexpr unsigned int kNumBufferSlots{2};
3159
42
}
3160
43
3161
44
namespace mcs {
3162
45
namespace mir {
3163
46
3164
47
StreamRenderer::Ptr StreamRenderer::Create(const StreamConnector::Ptr &connector, const video::BaseEncoder::Ptr &encoder) {
3165
48
    return std::shared_ptr<StreamRenderer>(new StreamRenderer(connector, encoder));
3166
49
}
3167
50
3168
51
StreamRenderer::StreamRenderer(const StreamConnector::Ptr &connector, const video::BaseEncoder::Ptr &encoder) :
3169
52
    connector_(connector),
3170
53
    encoder_(encoder),
3171
54
    running_(false),
3172
55
    width_(0),
3173
56
    height_(0),
3174
57
    input_buffers_(mcs::video::BufferQueue::Create(kNumBufferSlots)) {
3175
58
}
3176
59
3177
60
StreamRenderer::~StreamRenderer() {
3178
61
    Stop();
3179
62
}
3180
63
3181
64
void StreamRenderer::RenderThread() {
3182
65
    MCS_DEBUG("Everything successfully setup; Starting recording now %dx%d@%d",
3183
66
              width_, height_, encoder_->Configuration().framerate);
3184
67
3185
68
    bool waiting = false;
3186
69
    mcs::TimestampUs wait_slot_time;
3187
70
3188
71
    static int64_t start_time_us = mcs::Utils::GetNowUs();
3189
72
    static unsigned int frame_count = 0;
3190
73
    static const mcs::TimestampUs target_iteration_time = (1. / encoder_->Configuration().framerate) * 1000000ll;
3191
74
3192
75
    while (running_) {
3193
76
        if (!waiting)
3194
77
            wait_slot_time = mcs::Utils::GetNowUs();
3195
78
3196
79
        mcs::TimestampUs iteration_start_time = mcs::Utils::GetNowUs();
3197
80
3198
81
        if (!input_buffers_->WaitForSlots()) {
3199
82
            waiting = true;
3200
83
            continue;
3201
84
        }
3202
85
3203
86
        waiting = false;
3204
87
3205
88
        int64_t wait_time = (mcs::Utils::GetNowUs() - wait_slot_time) / 1000ll;
3206
89
        video::Statistics::Instance()->RecordRendererWait(wait_time);
3207
90
3208
91
        mcs::TimestampUs before_swap = mcs::Utils::GetNowUs();
3209
92
3210
93
        // This will trigger the rendering/compositing process inside mir
3211
94
        // and will block until that is done and we received a new buffer
3212
95
        connector_->SwapBuffersSync();
3213
96
3214
97
        int64_t swap_time = (mcs::Utils::GetNowUs() - before_swap) / 1000ll;
3215
98
        video::Statistics::Instance()->RecordRendererSwapped(swap_time);
3216
99
3217
100
        auto native_buffer = connector_->CurrentBuffer();
3218
101
3219
102
        auto buffer = mcs::video::Buffer::Create(native_buffer);
3220
103
        buffer->SetDelegate(shared_from_this());
3221
104
3222
105
        frame_count++;
3223
106
        int64_t time_now_us = mcs::Utils::GetNowUs();
3224
107
        if (start_time_us + 1000000ll <= time_now_us) {
3225
108
            video::Statistics::Instance()->RecordRendererFramesPerSecond(frame_count);
3226
109
            frame_count = 0;
3227
110
            start_time_us = time_now_us;
3228
111
        }
3229
112
3230
113
        // FIXME: at optimum we would get the timestamp directly supplied
3231
114
        // from mir but as long as that isn't available we don't have any
3232
115
        // other chance and need to do it here.
3233
116
        buffer->SetTimestamp(mcs::Utils::GetNowUs());
3234
117
3235
118
        input_buffers_->Push(buffer);
3236
119
3237
120
        encoder_->QueueBuffer(buffer);
3238
121
3239
122
        static mcs::TimestampUs last_queued_time = mcs::Utils::GetNowUs();
3240
123
        int64_t renderer_iteration_time = (mcs::Utils::GetNowUs() - last_queued_time) / 1000ll;
3241
124
        last_queued_time = mcs::Utils::GetNowUs();
3242
125
        video::Statistics::Instance()->RecordRendererIteration(renderer_iteration_time);
3243
126
3244
127
        mcs::TimestampUs iteration_time = mcs::Utils::GetNowUs() - iteration_start_time;
3245
128
        int64_t sleep_time = target_iteration_time - iteration_time;
3246
129
        if (sleep_time > 0)
3247
130
            std::this_thread::sleep_for(std::chrono::microseconds(sleep_time));
3248
131
    }
3249
132
}
3250
133
3251
134
void StreamRenderer::OnBufferFinished(const video::Buffer::Ptr &buffer) {
3252
135
    boost::ignore_unused_variable_warning(buffer);
3253
136
3254
137
    // We're currently relying on the buffers to come back in order so
3255
138
    // we can safely remove the head from the queue here which then
3256
139
    // gives us a free slot at the beginning which will be filled by
3257
140
    // the renderer again.
3258
141
    input_buffers_->Pop();
3259
142
}
3260
143
3261
144
void StreamRenderer::SetDimensions(unsigned int width, unsigned int height) {
3262
145
    width_ = width;
3263
146
    height_ = height;
3264
147
}
3265
148
3266
149
void StreamRenderer::StartThreaded() {
3267
150
    if (running_)
3268
151
        return;
3269
152
3270
153
    auto output_mode = connector_->OutputMode();
3271
154
3272
155
    if (width_ == 0 || height_ == 0) {
3273
156
        width_ = output_mode.width;
3274
157
        height_ = output_mode.height;
3275
158
    }
3276
159
3277
160
    running_ = true;
3278
161
3279
162
    render_thread_ = std::thread(&StreamRenderer::RenderThread, this);
3280
163
    pthread_setname_np(render_thread_.native_handle(), kStreamRendererThreadName);
3281
164
}
3282
165
3283
166
void StreamRenderer::Stop() {
3284
167
    if (!running_)
3285
168
        return;
3286
169
3287
170
    running_ = false;
3288
171
    render_thread_.join();
3289
172
}
3290
173
3291
174
} // namespace mir
3292
175
} // namespace mcs
3293
0
176
3294
=== added file 'src/mcs/mir/streamrenderer.h'
3295
--- src/mcs/mir/streamrenderer.h	1970-01-01 00:00:00 +0000
3296
+++ src/mcs/mir/streamrenderer.h	2016-02-25 12:47:02 +0000
3297
@@ -0,0 +1,69 @@
3298
1
/*
3299
2
 * Copyright (C) 2016 Canonical, Ltd.
3300
3
 *
3301
4
 * This program is free software: you can redistribute it and/or modify it
3302
5
 * under the terms of the GNU General Public License version 3, as published
3303
6
 * by the Free Software Foundation.
3304
7
 *
3305
8
 * This program is distributed in the hope that it will be useful, but
3306
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3307
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3308
11
 * PURPOSE.  See the GNU General Public License for more details.
3309
12
 *
3310
13
 * You should have received a copy of the GNU General Public License along
3311
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3312
15
 *
3313
16
 */
3314
17
3315
18
#ifndef MCS_MIR_STREAMRENDERER_H_
3316
19
#define MCS_MIR_STREAMRENDERER_H_
3317
20
3318
21
#include <memory>
3319
22
#include <thread>
3320
23
#include <mutex>
3321
24
#include <queue>
3322
25
3323
26
#include "mcs/mir/streamrenderer.h"
3324
27
#include "mcs/mir/streamconnector.h"
3325
28
3326
29
#include "mcs/video/baseencoder.h"
3327
30
#include "mcs/video/bufferqueue.h"
3328
31
3329
32
namespace mcs {
3330
33
namespace mir {
3331
34
class StreamRenderer : public std::enable_shared_from_this<StreamRenderer>,
3332
35
                       public mcs::video::Buffer::Delegate {
3333
36
public:
3334
37
    static constexpr unsigned int kNumTextures{2};
3335
38
3336
39
    typedef std::shared_ptr<StreamRenderer> Ptr;
3337
40
3338
41
    static Ptr Create(const StreamConnector::Ptr &connector, const video::BaseEncoder::Ptr &encoder);
3339
42
3340
43
    ~StreamRenderer();
3341
44
3342
45
    void SetDimensions(unsigned int width, unsigned int height);
3343
46
3344
47
    void StartThreaded();
3345
48
    void Stop();
3346
49
3347
50
    void OnBufferFinished(const mcs::video::Buffer::Ptr &buffer);
3348
51
3349
52
private:
3350
53
    StreamRenderer(const StreamConnector::Ptr &connector, const video::BaseEncoder::Ptr &encoder);
3351
54
3352
55
    void RenderThread();
3353
56
3354
57
private:
3355
58
    StreamConnector::Ptr connector_;
3356
59
    video::BaseEncoder::Ptr encoder_;
3357
60
    std::thread render_thread_;
3358
61
    bool running_;
3359
62
    unsigned int width_;
3360
63
    unsigned int height_;
3361
64
    mcs::video::BufferQueue::Ptr input_buffers_;
3362
65
};
3363
66
} // namespace mir
3364
67
} // namespace mcs
3365
68
3366
69
#endif
3367
0
70
3368
=== modified file 'src/mcs/miracastcontroller.h'
3369
--- src/mcs/miracastcontroller.h	2016-01-21 13:25:31 +0000
3370
+++ src/mcs/miracastcontroller.h	2016-02-25 12:47:02 +0000
3371
@@ -52,7 +52,9 @@
3372
52
    virtual void Connect(const NetworkDevice::Ptr &device, ResultCallback callback) = 0;
52
    virtual void Connect(const NetworkDevice::Ptr &device, ResultCallback callback) = 0;
3373
53
    virtual void Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback) = 0;
53
    virtual void Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback) = 0;
3374
54
54
3376
55
    virtual void Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) = 0;
55
    virtual void DisconnectAll(ResultCallback callback) = 0;
3377
56
3378
57
    virtual mcs::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) = 0;
3379
56
58
3380
57
    virtual NetworkDeviceState State() const = 0;
59
    virtual NetworkDeviceState State() const = 0;
3381
58
    virtual std::vector<NetworkManager::Capability> Capabilities() const = 0;
60
    virtual std::vector<NetworkManager::Capability> Capabilities() const = 0;
3382
59
61
3383
=== modified file 'src/mcs/miracastcontrollerskeleton.cpp'
3384
--- src/mcs/miracastcontrollerskeleton.cpp	2016-01-21 13:25:31 +0000
3385
+++ src/mcs/miracastcontrollerskeleton.cpp	2016-02-25 12:47:02 +0000
3386
@@ -119,6 +119,10 @@
3387
119
                     G_CALLBACK(&MiracastControllerSkeleton::OnHandleScan), new WeakKeepAlive<MiracastControllerSkeleton>(inst),
119
                     G_CALLBACK(&MiracastControllerSkeleton::OnHandleScan), new WeakKeepAlive<MiracastControllerSkeleton>(inst),
3388
120
                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(data); }, GConnectFlags(0));
120
                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(data); }, GConnectFlags(0));
3389
121
121
3390
122
    g_signal_connect_data(inst->manager_obj_.get(), "handle-disconnect-all",
3391
123
                     G_CALLBACK(&MiracastControllerSkeleton::OnHandleDisconnectAll), new WeakKeepAlive<MiracastControllerSkeleton>(inst),
3392
124
                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(data); }, GConnectFlags(0));
3393
125
3394
122
    inst->SyncProperties();
126
    inst->SyncProperties();
3395
123
127
3396
124
    g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(inst->manager_obj_.get()),
128
    g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(inst->manager_obj_.get()),
3397
@@ -142,13 +146,43 @@
3398
142
146
3399
143
    INFO("Scanning for remote devices");
147
    INFO("Scanning for remote devices");
3400
144
148
3402
145
    inst->Scan();
149
    auto error = inst->Scan();
3403
150
    if (error != mcs::Error::kNone) {
3404
151
        g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "%s", mcs::ErrorToString(error).c_str());
3405
152
        return TRUE;
3406
153
    }
3407
146
154
3408
147
    g_dbus_method_invocation_return_value(invocation, nullptr);
155
    g_dbus_method_invocation_return_value(invocation, nullptr);
3409
148
156
3410
149
    return TRUE;
157
    return TRUE;
3411
150
}
158
}
3412
151
159
3413
160
gboolean MiracastControllerSkeleton::OnHandleDisconnectAll(AethercastInterfaceManager *skeleton,
3414
161
                                                           GDBusMethodInvocation *invocation, gpointer user_data) {
3415
162
    boost::ignore_unused_variable_warning(skeleton);
3416
163
    auto inst = static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(user_data)->GetInstance().lock();
3417
164
3418
165
    if (not inst) {
3419
166
        g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Invalid state");
3420
167
        return TRUE;
3421
168
    }
3422
169
3423
170
    g_object_ref(invocation);
3424
171
    auto inv = make_shared_gobject(invocation);
3425
172
3426
173
    inst->DisconnectAll([inv](mcs::Error error) {
3427
174
        if (error != Error::kNone) {
3428
175
            g_dbus_method_invocation_return_error(inv.get(), G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
3429
176
                                                  "%s", mcs::ErrorToString(error).c_str());
3430
177
            return;
3431
178
        }
3432
179
3433
180
        g_dbus_method_invocation_return_value(inv.get(), nullptr);
3434
181
    });
3435
182
3436
183
    return TRUE;
3437
184
}
3438
185
3439
152
std::shared_ptr<MiracastControllerSkeleton> MiracastControllerSkeleton::FinalizeConstruction() {
186
std::shared_ptr<MiracastControllerSkeleton> MiracastControllerSkeleton::FinalizeConstruction() {
3440
153
    auto sp = shared_from_this();
187
    auto sp = shared_from_this();
3441
154
188
3442
155
189
3443
=== modified file 'src/mcs/miracastcontrollerskeleton.h'
3444
--- src/mcs/miracastcontrollerskeleton.h	2015-12-21 15:20:11 +0000
3445
+++ src/mcs/miracastcontrollerskeleton.h	2016-02-25 12:47:02 +0000
3446
@@ -58,6 +58,8 @@
3447
58
58
3448
59
    static gboolean OnHandleScan(AethercastInterfaceManager *skeleton, GDBusMethodInvocation *invocation,
59
    static gboolean OnHandleScan(AethercastInterfaceManager *skeleton, GDBusMethodInvocation *invocation,
3449
60
                                 gpointer user_data);
60
                                 gpointer user_data);
3450
61
    static gboolean OnHandleDisconnectAll(AethercastInterfaceManager *skeleton, GDBusMethodInvocation *invocation,
3451
62
                                          gpointer user_data);
3452
61
63
3453
62
    MiracastControllerSkeleton(const std::shared_ptr<MiracastController> &controller);
64
    MiracastControllerSkeleton(const std::shared_ptr<MiracastController> &controller);
3454
63
    std::shared_ptr<MiracastControllerSkeleton> FinalizeConstruction();
65
    std::shared_ptr<MiracastControllerSkeleton> FinalizeConstruction();
3455
64
66
3456
=== modified file 'src/mcs/miracastservice.cpp'
3457
--- src/mcs/miracastservice.cpp	2016-01-21 13:25:31 +0000
3458
+++ src/mcs/miracastservice.cpp	2016-02-25 12:47:02 +0000
3459
@@ -20,6 +20,9 @@
3460
20
#include <cstdint>
20
#include <cstdint>
3461
21
21
3462
22
#include <sys/prctl.h>
22
#include <sys/prctl.h>
3463
23
#include <signal.h>
3464
24
#include <sys/time.h>
3465
25
#include <sys/resource.h>
3466
23
26
3467
24
#include <glib.h>
27
#include <glib.h>
3468
25
#include <glib-unix.h>
28
#include <glib-unix.h>
3469
@@ -31,6 +34,7 @@
3470
31
34
3471
32
#include <wds/logging.h>
35
#include <wds/logging.h>
3472
33
36
3473
37
#include "initgstreameronce.h"
3474
34
#include "config.h"
38
#include "config.h"
3475
35
#include "keep_alive.h"
39
#include "keep_alive.h"
3476
36
#include "logger.h"
40
#include "logger.h"
3477
@@ -45,6 +49,7 @@
3478
45
const std::uint16_t kMiracastDefaultRtspCtrlPort{7236};
49
const std::uint16_t kMiracastDefaultRtspCtrlPort{7236};
3479
46
const std::chrono::milliseconds kStateIdleTimeout{5000};
50
const std::chrono::milliseconds kStateIdleTimeout{5000};
3480
47
const std::chrono::seconds kShutdownGracePreriod{1};
51
const std::chrono::seconds kShutdownGracePreriod{1};
3481
52
const std::int16_t kProcessPriorityUrgentDisplay{-8};
3482
48
53
3483
49
// SafeLog serves as integration point to the wds::LogSystem world.
54
// SafeLog serves as integration point to the wds::LogSystem world.
3484
50
template <mcs::Logger::Severity severity>
55
template <mcs::Logger::Severity severity>
3485
@@ -94,6 +99,9 @@
3486
94
        return 0;
99
        return 0;
3487
95
    }
100
    }
3488
96
101
3489
102
    if (options.debug)
3490
103
        mcs::Log().Init(mcs::Logger::Severity::kDebug);
3491
104
3492
97
    struct Runtime {
105
    struct Runtime {
3493
98
        static gboolean OnSignalRaised(gpointer user_data) {
106
        static gboolean OnSignalRaised(gpointer user_data) {
3494
99
            auto thiz = static_cast<Runtime*>(user_data);
107
            auto thiz = static_cast<Runtime*>(user_data);
3495
@@ -122,6 +130,9 @@
3496
122
            g_unix_signal_add(SIGINT, OnSignalRaised, this);
130
            g_unix_signal_add(SIGINT, OnSignalRaised, this);
3497
123
            g_unix_signal_add(SIGTERM, OnSignalRaised, this);
131
            g_unix_signal_add(SIGTERM, OnSignalRaised, this);
3498
124
132
3499
133
            // Initialize gstreamer.
3500
134
            mcs::InitGstreamerOnceOrThrow();
3501
135
3502
125
            // Redirect all wds logging to our own.
136
            // Redirect all wds logging to our own.
3503
126
            wds::LogSystem::set_vlog_func(SafeLog<mcs::Logger::Severity::kTrace>);
137
            wds::LogSystem::set_vlog_func(SafeLog<mcs::Logger::Severity::kTrace>);
3504
127
            wds::LogSystem::set_log_func(SafeLog<mcs::Logger::Severity::kInfo>);
138
            wds::LogSystem::set_log_func(SafeLog<mcs::Logger::Severity::kInfo>);
3505
@@ -156,6 +167,9 @@
3506
156
            if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0)
167
            if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0)
3507
157
                g_warning("Failed to make us a subreaper of our children");
168
                g_warning("Failed to make us a subreaper of our children");
3508
158
169
3509
170
            // Raise our process priority to be as fast as possible
3510
171
            setpriority(PRIO_PROCESS, 0, kProcessPriorityUrgentDisplay);
3511
172
3512
159
            network_manager = mcs::NetworkManagerFactory::Create();
173
            network_manager = mcs::NetworkManagerFactory::Create();
3513
160
            service = mcs::MiracastService::Create(network_manager);
174
            service = mcs::MiracastService::Create(network_manager);
3514
161
            mcsa = mcs::MiracastControllerSkeleton::create(service);
175
            mcsa = mcs::MiracastControllerSkeleton::create(service);
3515
@@ -202,6 +216,8 @@
3516
202
        network_manager_->Setup();
216
        network_manager_->Setup();
3517
203
    }
217
    }
3518
204
218
3519
219
    system_controller_ = mcs::SystemController::CreatePlatformDefault();
3520
220
3521
205
    return shared_from_this();
221
    return shared_from_this();
3522
206
}
222
}
3523
207
223
3524
@@ -246,8 +262,6 @@
3525
246
}
262
}
3526
247
263
3527
248
void MiracastService::AdvanceState(NetworkDeviceState new_state) {
264
void MiracastService::AdvanceState(NetworkDeviceState new_state) {
3528
249
    IpV4Address address;
3529
250
3530
251
    DEBUG("new state %s current state %s",
265
    DEBUG("new state %s current state %s",
3531
252
          mcs::NetworkDevice::StateToStr(new_state),
266
          mcs::NetworkDevice::StateToStr(new_state),
3532
253
          mcs::NetworkDevice::StateToStr(current_state_));
267
          mcs::NetworkDevice::StateToStr(current_state_));
3533
@@ -256,13 +270,12 @@
3534
256
    case kAssociation:
270
    case kAssociation:
3535
257
        break;
271
        break;
3536
258
272
3537
273
    case kConfiguration:
3538
274
        break;
3539
275
3540
259
    case kConnected:
276
    case kConnected:
3545
260
        address = network_manager_->LocalAddress();
277
        source_ = MiracastSourceManager::Create(network_manager_->LocalAddress(), kMiracastDefaultRtspCtrlPort);
3542
261
3543
262
        source_ = MiracastSourceManager::Create(address, kMiracastDefaultRtspCtrlPort);
3544
263
3546
264
        FinishConnectAttempt();
278
        FinishConnectAttempt();
3547
265
3548
266
        break;
279
        break;
3549
267
280
3550
268
    case kFailure:
281
    case kFailure:
3551
@@ -272,6 +285,8 @@
3552
272
        source_.reset();
285
        source_.reset();
3553
273
        current_device_.reset();
286
        current_device_.reset();
3554
274
287
3555
288
        system_controller_->DisplayStateLock()->Release(mcs::DisplayState::On);
3556
289
3557
275
        StartIdleTimer();
290
        StartIdleTimer();
3558
276
        break;
291
        break;
3559
277
292
3560
@@ -359,6 +374,8 @@
3561
359
        return;
374
        return;
3562
360
    }
375
    }
3563
361
376
3564
377
    system_controller_->DisplayStateLock()->Acquire(mcs::DisplayState::On);
3565
378
3566
362
    current_device_ = device;
379
    current_device_ = device;
3567
363
    connect_callback_ = callback;
380
    connect_callback_ = callback;
3568
364
}
381
}
3569
@@ -377,8 +394,17 @@
3570
377
    callback(Error::kNone);
394
    callback(Error::kNone);
3571
378
}
395
}
3572
379
396
3574
380
void MiracastService::Scan(const std::chrono::seconds &timeout) {
397
void MiracastService::DisconnectAll(ResultCallback callback) {
3575
398
    Disconnect(current_device_, callback);
3576
399
}
3577
400
3578
401
mcs::Error MiracastService::Scan(const std::chrono::seconds &timeout) {
3579
402
    if (current_device_)
3580
403
        return mcs::Error::kInvalidState;
3581
404
3582
381
    network_manager_->Scan(timeout);
405
    network_manager_->Scan(timeout);
3583
406
3584
407
    return mcs::Error::kNone;
3585
382
}
408
}
3586
383
409
3587
384
void MiracastService::Shutdown() {
410
void MiracastService::Shutdown() {
3588
385
411
3589
=== modified file 'src/mcs/miracastservice.h'
3590
--- src/mcs/miracastservice.h	2016-01-21 13:25:31 +0000
3591
+++ src/mcs/miracastservice.h	2016-02-25 12:47:02 +0000
3592
@@ -32,6 +32,7 @@
3593
32
#include "networkdevice.h"
32
#include "networkdevice.h"
3594
33
#include "non_copyable.h"
33
#include "non_copyable.h"
3595
34
#include "types.h"
34
#include "types.h"
3596
35
#include "systemcontroller.h"
3597
35
36
3598
36
namespace mcs {
37
namespace mcs {
3599
37
class MiracastService : public MiracastController,
38
class MiracastService : public MiracastController,
3600
@@ -64,7 +65,9 @@
3601
64
    void Connect(const NetworkDevice::Ptr &device, ResultCallback callback);
65
    void Connect(const NetworkDevice::Ptr &device, ResultCallback callback);
3602
65
    void Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback);
66
    void Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback);
3603
66
67
3605
67
    void Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30});
68
    void DisconnectAll(ResultCallback callback);
3606
69
3607
70
    mcs::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30});
3608
68
71
3609
69
    NetworkDeviceState State() const;
72
    NetworkDeviceState State() const;
3610
70
    std::vector<NetworkManager::Capability> Capabilities() const;
73
    std::vector<NetworkManager::Capability> Capabilities() const;
3611
@@ -104,6 +107,7 @@
3612
104
    guint scan_timeout_source_;
107
    guint scan_timeout_source_;
3613
105
    ResultCallback current_scan_callback_;
108
    ResultCallback current_scan_callback_;
3614
106
    std::vector<NetworkDeviceRole> supported_roles_;
109
    std::vector<NetworkDeviceRole> supported_roles_;
3615
110
    mcs::SystemController::Ptr system_controller_;
3616
107
};
111
};
3617
108
} // namespace mcs
112
} // namespace mcs
3618
109
#endif
113
#endif
3619
110
114
3620
=== modified file 'src/mcs/miracastsourceclient.cpp'
3621
--- src/mcs/miracastsourceclient.cpp	2015-12-09 16:07:13 +0000
3622
+++ src/mcs/miracastsourceclient.cpp	2016-02-25 12:47:02 +0000
3623
@@ -25,7 +25,7 @@
3624
25
#include "keep_alive.h"
25
#include "keep_alive.h"
3625
26
#include "logger.h"
26
#include "logger.h"
3626
27
#include "miracastsourceclient.h"
27
#include "miracastsourceclient.h"
3628
28
#include "mirsourcemediamanager.h"
28
#include "mcs/mir/sourcemediamanager.h"
3629
29
#include "testsourcemediamanager.h"
29
#include "testsourcemediamanager.h"
3630
30
#include "mediamanagerfactory.h"
30
#include "mediamanagerfactory.h"
3631
31
31
3632
@@ -34,14 +34,15 @@
3633
34
#include "logging.h"
34
#include "logging.h"
3634
35
35
3635
36
namespace mcs {
36
namespace mcs {
3638
37
std::shared_ptr<MiracastSourceClient> MiracastSourceClient::Create(ScopedGObject<GSocket>&& socket) {
37
std::shared_ptr<MiracastSourceClient> MiracastSourceClient::Create(ScopedGObject<GSocket>&& socket, const mcs::IpV4Address &local_address) {
3639
38
    std::shared_ptr<MiracastSourceClient> sp{new MiracastSourceClient{std::move(socket)}};
38
    std::shared_ptr<MiracastSourceClient> sp{new MiracastSourceClient{std::move(socket), local_address}};
3640
39
    return sp->FinalizeConstruction();
39
    return sp->FinalizeConstruction();
3641
40
}
40
}
3642
41
41
3644
42
MiracastSourceClient::MiracastSourceClient(ScopedGObject<GSocket>&& socket) :
42
MiracastSourceClient::MiracastSourceClient(ScopedGObject<GSocket>&& socket, const mcs::IpV4Address &local_address) :
3645
43
    socket_(std::move(socket)),
43
    socket_(std::move(socket)),
3647
44
    socket_source_(0) {
44
    socket_source_(0),
3648
45
    local_address_(local_address) {
3649
45
}
46
}
3650
46
47
3651
47
MiracastSourceClient::~MiracastSourceClient() {
48
MiracastSourceClient::~MiracastSourceClient() {
3652
@@ -82,7 +83,15 @@
3653
82
}
83
}
3654
83
84
3655
84
std::string MiracastSourceClient::GetLocalIPAddress() const {
85
std::string MiracastSourceClient::GetLocalIPAddress() const {
3657
85
    return local_address_;
86
    return local_address_.to_string();
3658
87
}
3659
88
3660
89
int MiracastSourceClient::GetNextCSeq(int *initial_peer_cseq) const {
3661
90
    static int send_cseq = 0;
3662
91
    ++send_cseq;
3663
92
    if (initial_peer_cseq && send_cseq == *initial_peer_cseq)
3664
93
        send_cseq *= 2;
3665
94
    return send_cseq;
3666
86
}
95
}
3667
87
96
3668
88
class TimerCallbackData {
97
class TimerCallbackData {
3669
89
98
3670
=== modified file 'src/mcs/miracastsourceclient.h'
3671
--- src/mcs/miracastsourceclient.h	2015-12-07 09:07:50 +0000
3672
+++ src/mcs/miracastsourceclient.h	2016-02-25 12:47:02 +0000
3673
@@ -31,8 +31,9 @@
3674
31
#include <wds/source.h>
31
#include <wds/source.h>
3675
32
#include <wds/media_manager.h>
32
#include <wds/media_manager.h>
3676
33
33
3679
34
#include "non_copyable.h"
34
#include "mcs/ip_v4_address.h"
3680
35
#include "scoped_gobject.h"
35
#include "mcs/non_copyable.h"
3681
36
#include "mcs/scoped_gobject.h"
3682
36
37
3683
37
namespace mcs {
38
namespace mcs {
3684
38
class TimerCallbackData;
39
class TimerCallbackData;
3685
@@ -45,7 +46,7 @@
3686
45
        virtual void OnConnectionClosed() = 0;
46
        virtual void OnConnectionClosed() = 0;
3687
46
    };
47
    };
3688
47
48
3690
48
    static std::shared_ptr<MiracastSourceClient> Create(ScopedGObject<GSocket>&& socket);
49
    static std::shared_ptr<MiracastSourceClient> Create(ScopedGObject<GSocket>&& socket, const mcs::IpV4Address &local_address);
3691
49
50
3692
50
    ~MiracastSourceClient();
51
    ~MiracastSourceClient();
3693
51
52
3694
@@ -57,6 +58,7 @@
3695
57
    std::string GetLocalIPAddress() const override;
58
    std::string GetLocalIPAddress() const override;
3696
58
    uint CreateTimer(int seconds) override;
59
    uint CreateTimer(int seconds) override;
3697
59
    void ReleaseTimer(uint timerId) override;
60
    void ReleaseTimer(uint timerId) override;
3698
61
    int GetNextCSeq(int* initial_peer_cseq = nullptr) const override;
3699
60
62
3700
61
public:
63
public:
3701
62
    static gboolean OnTimeout(gpointer user_data);
64
    static gboolean OnTimeout(gpointer user_data);
3702
@@ -65,7 +67,7 @@
3703
65
                                     gpointer user_data);
67
                                     gpointer user_data);
3704
66
68
3705
67
private:
69
private:
3707
68
    MiracastSourceClient(ScopedGObject<GSocket>&& socket);
70
    MiracastSourceClient(ScopedGObject<GSocket>&& socket, const mcs::IpV4Address &local_address);
3708
69
    std::shared_ptr<MiracastSourceClient> FinalizeConstruction();
71
    std::shared_ptr<MiracastSourceClient> FinalizeConstruction();
3709
70
72
3710
71
    void DumpRtsp(const std::string &prefix, const std::string &data);
73
    void DumpRtsp(const std::string &prefix, const std::string &data);
3711
@@ -75,7 +77,7 @@
3712
75
    std::weak_ptr<Delegate> delegate_;
77
    std::weak_ptr<Delegate> delegate_;
3713
76
    ScopedGObject<GSocket> socket_;
78
    ScopedGObject<GSocket> socket_;
3714
77
    guint socket_source_;
79
    guint socket_source_;
3716
78
    std::string local_address_;
80
    mcs::IpV4Address local_address_;
3717
79
    std::vector<guint> timers_;
81
    std::vector<guint> timers_;
3718
80
    std::unique_ptr<wds::Source> source_;
82
    std::unique_ptr<wds::Source> source_;
3719
81
    std::shared_ptr<wds::SourceMediaManager> media_manager_;
83
    std::shared_ptr<wds::SourceMediaManager> media_manager_;
3720
82
84
3721
=== modified file 'src/mcs/miracastsourcemanager.cpp'
3722
--- src/mcs/miracastsourcemanager.cpp	2016-01-16 13:40:27 +0000
3723
+++ src/mcs/miracastsourcemanager.cpp	2016-02-25 12:47:02 +0000
3724
@@ -22,7 +22,7 @@
3725
22
#include "logging.h"
22
#include "logging.h"
3726
23
23
3727
24
namespace mcs {
24
namespace mcs {
3729
25
std::shared_ptr<MiracastSourceManager> MiracastSourceManager::Create(const IpV4Address &address, unsigned short port) {
25
std::shared_ptr<MiracastSourceManager> MiracastSourceManager::Create(const mcs::IpV4Address &address, unsigned short port) {
3730
26
    auto sp = std::shared_ptr<MiracastSourceManager>{new MiracastSourceManager{}};
26
    auto sp = std::shared_ptr<MiracastSourceManager>{new MiracastSourceManager{}};
3731
27
    sp->Setup(address, port);
27
    sp->Setup(address, port);
3732
28
    return sp;
28
    return sp;
3733
@@ -49,7 +49,7 @@
3734
49
    delegate_.reset();
49
    delegate_.reset();
3735
50
}
50
}
3736
51
51
3738
52
bool MiracastSourceManager::Setup(const IpV4Address &address, unsigned short port) {
52
bool MiracastSourceManager::Setup(const mcs::IpV4Address &address, unsigned short port) {
3739
53
    GError *error = nullptr;
53
    GError *error = nullptr;
3740
54
54
3741
55
    if (socket_)
55
    if (socket_)
3742
@@ -97,8 +97,9 @@
3743
97
97
3744
98
    g_source_unref(source);
98
    g_source_unref(source);
3745
99
99
3748
100
    DEBUG("Successfully setup source on %s:%d and awaiting incoming connection requests",
100
    DEBUG("Successfully setup source on %s:%d and awaiting incoming connection requests", address.to_string(), port);
3749
101
          address.to_string(), port);
101
3750
102
    local_address_ = address;
3751
102
103
3752
103
    socket_.swap(socket);
104
    socket_.swap(socket);
3753
104
105
3754
@@ -132,7 +133,7 @@
3755
132
        return TRUE;
133
        return TRUE;
3756
133
    }
134
    }
3757
134
135
3759
135
    inst->active_sink_ = MiracastSourceClient::Create(ScopedGObject<GSocket>{client_socket});
136
    inst->active_sink_ = MiracastSourceClient::Create(ScopedGObject<GSocket>{client_socket}, inst->local_address_);
3760
136
    inst->active_sink_->SetDelegate(inst->shared_from_this());
137
    inst->active_sink_->SetDelegate(inst->shared_from_this());
3761
137
138
3762
138
    return TRUE;
139
    return TRUE;
3763
139
140
3764
=== modified file 'src/mcs/miracastsourcemanager.h'
3765
--- src/mcs/miracastsourcemanager.h	2015-12-09 16:07:13 +0000
3766
+++ src/mcs/miracastsourcemanager.h	2016-02-25 12:47:02 +0000
3767
@@ -41,7 +41,7 @@
3768
41
        Delegate() = default;
41
        Delegate() = default;
3769
42
    };
42
    };
3770
43
43
3772
44
    static std::shared_ptr<MiracastSourceManager> Create(const IpV4Address &address, unsigned short port);
44
    static std::shared_ptr<MiracastSourceManager> Create(const mcs::IpV4Address &address, unsigned short port);
3773
45
45
3774
46
    ~MiracastSourceManager();
46
    ~MiracastSourceManager();
3775
47
47
3776
@@ -56,13 +56,14 @@
3777
56
56
3778
57
    MiracastSourceManager();
57
    MiracastSourceManager();
3779
58
58
3781
59
    bool Setup(const IpV4Address &address, unsigned short port);
59
    bool Setup(const mcs::IpV4Address &address, unsigned short port);
3782
60
60
3783
61
private:
61
private:
3784
62
    std::weak_ptr<Delegate> delegate_;
62
    std::weak_ptr<Delegate> delegate_;
3785
63
    ScopedGObject<GSocket> socket_;
63
    ScopedGObject<GSocket> socket_;
3786
64
    guint socket_source_;
64
    guint socket_source_;
3787
65
    std::shared_ptr<MiracastSourceClient> active_sink_;
65
    std::shared_ptr<MiracastSourceClient> active_sink_;
3788
66
    mcs::IpV4Address local_address_;
3789
66
};
67
};
3790
67
} // namespace mcs
68
} // namespace mcs
3791
68
#endif
69
#endif
3792
69
70
3793
=== removed file 'src/mcs/networkdeviceskeleton.cpp'
3794
--- src/mcs/networkdeviceskeleton.cpp	2016-01-21 13:25:31 +0000
3795
+++ src/mcs/networkdeviceskeleton.cpp	1970-01-01 00:00:00 +0000
3796
@@ -1,142 +0,0 @@
3797
1
/*
3798
2
 * Copyright (C) 2015 Canonical, Ltd.
3799
3
 *
3800
4
 * This program is free software: you can redistribute it and/or modify it
3801
5
 * under the terms of the GNU General Public License version 3, as published
3802
6
 * by the Free Software Foundation.
3803
7
 *
3804
8
 * This program is distributed in the hope that it will be useful, but
3805
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3806
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3807
11
 * PURPOSE.  See the GNU General Public License for more details.
3808
12
 *
3809
13
 * You should have received a copy of the GNU General Public License along
3810
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3811
15
 *
3812
16
 */
3813
17
3814
18
#include <algorithm>
3815
19
#include <boost/concept_check.hpp>
3816
20
3817
21
#include "networkdeviceskeleton.h"
3818
22
#include "utils.h"
3819
23
#include "keep_alive.h"
3820
24
#include "logger.h"
3821
25
#include "dbushelpers.h"
3822
26
3823
27
namespace mcs {
3824
28
3825
29
NetworkDeviceSkeleton::Ptr NetworkDeviceSkeleton::Create(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const MiracastController::Ptr &controller) {
3826
30
    return std::shared_ptr<NetworkDeviceSkeleton>(new NetworkDeviceSkeleton(connection, path, device, controller))->FinalizeConstruction();
3827
31
}
3828
32
3829
33
NetworkDeviceSkeleton::NetworkDeviceSkeleton(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const MiracastController::Ptr &controller) :
3830
34
    ForwardingNetworkDevice(device),
3831
35
    connection_(connection),
3832
36
    object_(make_shared_gobject(aethercast_interface_object_skeleton_new(path.c_str()))),
3833
37
    path_(path),
3834
38
    controller_(controller),
3835
39
    device_iface_(aethercast_interface_device_skeleton_new()) {
3836
40
}
3837
41
3838
42
std::shared_ptr<NetworkDeviceSkeleton> NetworkDeviceSkeleton::FinalizeConstruction() {
3839
43
    auto sp = shared_from_this();
3840
44
3841
45
    g_signal_connect(device_iface_.get(), "handle-connect",
3842
46
                     G_CALLBACK(&NetworkDeviceSkeleton::OnHandleConnect),
3843
47
                     new WeakKeepAlive<NetworkDeviceSkeleton>{sp});
3844
48
    g_signal_connect(device_iface_.get(), "handle-disconnect",
3845
49
                     G_CALLBACK(&NetworkDeviceSkeleton::OnHandleDisconnect),
3846
50
                     new WeakKeepAlive<NetworkDeviceSkeleton>{sp});
3847
51
3848
52
    SyncProperties();
3849
53
3850
54
    if (!object_)
3851
55
        ERROR("Failed to create object for device %s", Address());
3852
56
    else
3853
57
        aethercast_interface_object_skeleton_set_device(object_.get(), device_iface_.get());
3854
58
3855
59
    return sp;
3856
60
}
3857
61
3858
62
void NetworkDeviceSkeleton::SyncProperties() {
3859
63
    aethercast_interface_device_set_address(device_iface_.get(), Address().c_str());
3860
64
    aethercast_interface_device_set_name(device_iface_.get(), Name().c_str());
3861
65
    aethercast_interface_device_set_state(device_iface_.get(), NetworkDevice::StateToStr(State()).c_str());
3862
66
3863
67
    auto capabilities = DBusHelpers::GenerateDeviceCapabilities(SupportedRoles());
3864
68
    aethercast_interface_device_set_capabilities(device_iface_.get(), capabilities);
3865
69
    g_strfreev(capabilities);
3866
70
}
3867
71
3868
72
GDBusObjectSkeleton* NetworkDeviceSkeleton::DBusObject() const {
3869
73
    return G_DBUS_OBJECT_SKELETON(object_.get());
3870
74
}
3871
75
3872
76
std::string NetworkDeviceSkeleton::Path() const {
3873
77
    return path_;
3874
78
}
3875
79
3876
80
// TODO(tvoss,morphis): Refactor mcs::NetworkDevice to have Connect/Disconnect defined on its interfaces.
3877
81
// It feels quite dirty to require both an instance of mcs::NetworkDevice and mcs::MiracastController to
3878
82
// implement the connect/disconnect calls coming in via the bus. The complication then is the async handling of
3879
83
// the invocation, as we will likely have to reach out to WPASupplicant for example (which is dispatched via the same
3880
84
// event loop as we are). In addition, we should not start littering our public interfaces by handing down callbacks.
3881
85
gboolean NetworkDeviceSkeleton::OnHandleConnect(AethercastInterfaceDevice *skeleton, GDBusMethodInvocation *invocation,
3882
86
                                           const gchar *role, gpointer user_data)
3883
87
{
3884
88
    boost::ignore_unused_variable_warning(skeleton);
3885
89
    boost::ignore_unused_variable_warning(role);
3886
90
3887
91
    auto inst = static_cast<WeakKeepAlive<NetworkDeviceSkeleton>*>(user_data)->GetInstance().lock();
3888
92
3889
93
    if (not inst) {
3890
94
        g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Invalid state");
3891
95
        return TRUE;
3892
96
    }
3893
97
3894
98
    g_object_ref(invocation);
3895
99
    auto inv = make_shared_gobject(invocation);
3896
100
3897
101
    inst->controller_->Connect(inst->Fwd(), [inv](mcs::Error error) {
3898
102
        if (error != Error::kNone) {
3899
103
            g_dbus_method_invocation_return_error(inv.get(), G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
3900
104
                                                  "%s", mcs::ErrorToString(error).c_str());
3901
105
            return;
3902
106
        }
3903
107
3904
108
        g_dbus_method_invocation_return_value(inv.get(), nullptr);
3905
109
    });
3906
110
3907
111
    return TRUE;
3908
112
}
3909
113
3910
114
gboolean NetworkDeviceSkeleton::OnHandleDisconnect(AethercastInterfaceDevice *skeleton, GDBusMethodInvocation *invocation,
3911
115
                                                   gpointer user_data)
3912
116
{
3913
117
    boost::ignore_unused_variable_warning(skeleton);
3914
118
3915
119
    auto inst = static_cast<WeakKeepAlive<NetworkDeviceSkeleton>*>(user_data)->GetInstance().lock();
3916
120
3917
121
    if (not inst) {
3918
122
        g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Invalid state");
3919
123
        return TRUE;
3920
124
    }
3921
125
3922
126
    g_object_ref(invocation);
3923
127
    auto inv = make_shared_gobject(invocation);
3924
128
3925
129
    inst->controller_->Disconnect(inst->Fwd(), [inv](mcs::Error error) {
3926
130
        if (error != Error::kNone) {
3927
131
            g_dbus_method_invocation_return_error(inv.get(), G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
3928
132
                                                  "%s", mcs::ErrorToString(error).c_str());
3929
133
            return;
3930
134
        }
3931
135
3932
136
        g_dbus_method_invocation_return_value(inv.get(), nullptr);
3933
137
    });
3934
138
3935
139
    return TRUE;
3936
140
}
3937
141
3938
142
} // namespace mcs
3939
143
0
3940
=== modified file 'src/mcs/networkutils.cpp'
3941
--- src/mcs/networkutils.cpp	2016-01-15 19:31:22 +0000
3942
+++ src/mcs/networkutils.cpp	2016-02-25 12:47:02 +0000
3943
@@ -15,17 +15,28 @@
3944
15
 *
15
 *
3945
16
 */
16
 */
3946
17
17
3947
18
3948
18
#include <sys/ioctl.h>
19
#include <sys/ioctl.h>
3949
19
#include <net/if.h>
3950
20
#include <asm/types.h>
20
#include <asm/types.h>
3951
21
#include <linux/netlink.h>
3952
22
#include <linux/rtnetlink.h>
3953
23
#include <sys/socket.h>
21
#include <sys/socket.h>
3954
24
#include <netinet/in.h>
22
#include <netinet/in.h>
3955
25
#include <arpa/inet.h>
23
#include <arpa/inet.h>
3956
26
#include <unistd.h>
24
#include <unistd.h>
3957
27
#include <errno.h>
25
#include <errno.h>
3958
28
#include <memory.h>
26
#include <memory.h>
3959
27
#include <stdlib.h>
3960
28
#include <errno.h>
3961
29
3962
30
#include <linux/netlink.h>
3963
31
#include <linux/rtnetlink.h>
3964
32
3965
33
// Hacks necessary to be able to include wireless.h
3966
34
#ifndef __user
3967
35
#define __user
3968
36
#endif
3969
37
3970
38
#include <linux/if.h>
3971
39
#include <linux/wireless.h>
3972
29
40
3973
30
#include <glib.h>
41
#include <glib.h>
3974
31
42
3975
@@ -33,6 +44,9 @@
3976
33
#include "networkutils.h"
44
#include "networkutils.h"
3977
34
#include "logger.h"
45
#include "logger.h"
3978
35
46
3979
47
namespace {
3980
48
static constexpr size_t kDriverCommandReplySize{1024};
3981
49
3982
36
#define NLMSG_TAIL(nmsg)				\
50
#define NLMSG_TAIL(nmsg)				\
3983
37
    ((struct rtattr *) (((uint8_t*) (nmsg)) +	\
51
    ((struct rtattr *) (((uint8_t*) (nmsg)) +	\
3984
38
    NLMSG_ALIGN((nmsg)->nlmsg_len)))
52
    NLMSG_ALIGN((nmsg)->nlmsg_len)))
3985
@@ -56,6 +70,7 @@
3986
56
70
3987
57
    return 0;
71
    return 0;
3988
58
}
72
}
3989
73
}
3990
59
74
3991
60
namespace mcs {
75
namespace mcs {
3992
61
int NetworkUtils::ModifyInterfaceAddress(int cmd, int flags,
76
int NetworkUtils::ModifyInterfaceAddress(int cmd, int flags,
3993
@@ -259,4 +274,47 @@
3994
259
        available = (int64_t) nbytes;
274
        available = (int64_t) nbytes;
3995
260
    return available;
275
    return available;
3996
261
}
276
}
3997
277
3998
278
typedef struct {
3999
279
#ifdef SUPPORT_64BIT
4000
280
    u64 bufaddr;
4001
281
#else
4002
282
    char *bufaddr;
4003
283
#endif
4004
284
    int used_len;
4005
285
    int total_len;
4006
286
} android_wifi_priv_cmd;
4007
287
4008
288
int NetworkUtils::SendDriverPrivateCommand(const std::string &ifname, const std::string &cmd) {
4009
289
    struct ifreq ifr;
4010
290
    int ret = 0, s;
4011
291
    android_wifi_priv_cmd priv_cmd;
4012
292
    char buf[kDriverCommandReplySize];
4013
293
    size_t buf_len = kDriverCommandReplySize;
4014
294
4015
295
    ::memset(buf, 0, sizeof(buf));
4016
296
    ::memcpy(buf, cmd.c_str(), cmd.length() + 1);
4017
297
    ::memset(&ifr, 0, sizeof(ifr));
4018
298
    ::memset(&priv_cmd, 0, sizeof(priv_cmd));
4019
299
4020
300
    ::strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ);
4021
301
4022
302
#ifdef SUPPORT_64BIT
4023
303
    priv_cmd.bufaddr = (u64)(uintptr_t) buf;
4024
304
#else
4025
305
    priv_cmd.bufaddr = buf;
4026
306
#endif
4027
307
    priv_cmd.used_len = buf_len;
4028
308
    priv_cmd.total_len = buf_len;
4029
309
    ifr.ifr_data = &priv_cmd;
4030
310
4031
311
    s = ::socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
4032
312
    if (s < 0)
4033
313
        return -EIO;
4034
314
4035
315
    ret = ::ioctl(s, SIOCDEVPRIVATE + 1, &ifr);
4036
316
    ::close(s);
4037
317
    return ret;
4038
318
}
4039
319
4040
262
} // namespace mcs
320
} // namespace mcs
4041
263
321
4042
=== modified file 'src/mcs/networkutils.h'
4043
--- src/mcs/networkutils.h	2016-01-15 19:31:22 +0000
4044
+++ src/mcs/networkutils.h	2016-02-25 12:47:02 +0000
4045
@@ -18,6 +18,8 @@
4046
18
#ifndef NETWORKUTILS_H_
18
#ifndef NETWORKUTILS_H_
4047
19
#define NETWORKUTILS_H_
19
#define NETWORKUTILS_H_
4048
20
20
4049
21
#include <string>
4050
22
4051
21
namespace mcs {
23
namespace mcs {
4052
22
class NetworkUtils
24
class NetworkUtils
4053
23
{
25
{
4054
@@ -29,6 +31,7 @@
4055
29
                             unsigned char prefixlen, const char *broadcast);
31
                             unsigned char prefixlen, const char *broadcast);
4056
30
    static int ResetInterface(int index);
32
    static int ResetInterface(int index);
4057
31
    static int BytesAvailableToRead(int fd);
33
    static int BytesAvailableToRead(int fd);
4058
34
    static int SendDriverPrivateCommand(const std::string &ifname, const std::string &cmd);
4059
32
};
35
};
4060
33
} // namespace mcs
36
} // namespace mcs
4061
34
#endif
37
#endif
4062
35
38
4063
=== added directory 'src/mcs/streaming'
4064
=== added file 'src/mcs/streaming/mpegtspacketizer.cpp'
4065
--- src/mcs/streaming/mpegtspacketizer.cpp	1970-01-01 00:00:00 +0000
4066
+++ src/mcs/streaming/mpegtspacketizer.cpp	2016-02-25 12:47:02 +0000
4067
@@ -0,0 +1,831 @@
4068
1
/*
4069
2
 * Copyright 2012, The Android Open Source Project
4070
3
 * Copyright (C) 2016 Canonical, Ltd.
4071
4
 *
4072
5
 * Licensed under the Apache License, Version 2.0 (the "License");
4073
6
 * you may not use this file except in compliance with the License.
4074
7
 * You may obtain a copy of the License at
4075
8
 *
4076
9
 *     http://www.apache.org/licenses/LICENSE-2.0
4077
10
 *
4078
11
 * Unless required by applicable law or agreed to in writing, software
4079
12
 * distributed under the License is distributed on an "AS IS" BASIS,
4080
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
4081
14
 * See the License for the specific language governing permissions and
4082
15
 * limitations under the License.
4083
16
 */
4084
17
4085
18
/**
4086
19
 * NOTE: The implementation is based on the Android implementation for WiFi
4087
20
 * display support in frameworks/av/libstagefright/wifi-display/TSPacketizer.cpp
4088
21
 * and is adjusted for our needs.
4089
22
 */
4090
23
4091
24
#include <arpa/inet.h>
4092
25
#include <memory.h>
4093
26
4094
27
#include "mcs/utils.h"
4095
28
#include "mcs/logger.h"
4096
29
4097
30
#include "mcs/video/utils.h"
4098
31
4099
32
#include "mcs/streaming/mpegtspacketizer.h"
4100
33
4101
34
namespace {
4102
35
const unsigned int kPIDofPMT = 0x100;
4103
36
const unsigned int kPIDofPCR = 0x1000;
4104
37
}
4105
38
4106
39
namespace mcs {
4107
40
namespace streaming {
4108
41
4109
42
struct MPEGTSPacketizer::Track {
4110
43
    typedef std::shared_ptr<Track> Ptr;
4111
44
4112
45
    static Ptr Create(const TrackFormat &format, unsigned int pid,
4113
46
                      unsigned int stream_type, unsigned int stream_id);
4114
47
4115
48
    unsigned int PID() const { return pid_; }
4116
49
    unsigned int StreamType() const { return stream_type_; }
4117
50
    unsigned int StreamId() const { return stream_id_; }
4118
51
    TrackFormat Format() const { return format_; }
4119
52
4120
53
    unsigned int NextContinuityCounter();
4121
54
4122
55
    bool IsAudio() const { return mcs::Utils::StringStartsWith(format_.mime, "audio/"); }
4123
56
    bool IsVideo() const { return mcs::Utils::StringStartsWith(format_.mime, "video/"); }
4124
57
4125
58
    bool IsH264() const { return format_.mime == "video/avc"; }
4126
59
4127
60
    void SubmitCSD(const mcs::video::Buffer::Ptr &buffer);
4128
61
4129
62
    mcs::video::Buffer::Ptr PrependCSD(const mcs::video::Buffer::Ptr &buffer) const;
4130
63
4131
64
    void Finalize();
4132
65
4133
66
    std::vector<mcs::video::Buffer::Ptr> Descriptors() const { return descriptors_; }
4134
67
4135
68
private:
4136
69
    Track(const TrackFormat &format, unsigned int pid,
4137
70
          unsigned int stream_type, unsigned int stream_id);
4138
71
4139
72
private:
4140
73
    TrackFormat format_;
4141
74
    unsigned int pid_;
4142
75
    unsigned int stream_type_;
4143
76
    unsigned int stream_id_;
4144
77
    unsigned int continuity_counter_;
4145
78
    bool finalized_;
4146
79
    std::vector<mcs::video::Buffer::Ptr> csd_;
4147
80
    std::vector<mcs::video::Buffer::Ptr> descriptors_;
4148
81
};
4149
82
4150
83
MPEGTSPacketizer::Track::Ptr MPEGTSPacketizer::Track::Create(const TrackFormat &format, unsigned int pid,
4151
84
                                                             unsigned int stream_type, unsigned int stream_id) {
4152
85
    return std::shared_ptr<Track>(new Track(format, pid, stream_type, stream_id));
4153
86
}
4154
87
4155
88
MPEGTSPacketizer::Track::Track(const TrackFormat &format, unsigned int pid,
4156
89
                               unsigned int stream_type, unsigned int stream_id) :
4157
90
    format_(format),
4158
91
    pid_(pid),
4159
92
    stream_type_(stream_type),
4160
93
    stream_id_(stream_id),
4161
94
    continuity_counter_(0),
4162
95
    finalized_(false) {
4163
96
}
4164
97
4165
98
unsigned int MPEGTSPacketizer::Track::NextContinuityCounter() {
4166
99
    unsigned int prev = continuity_counter_;
4167
100
    if (++continuity_counter_ == 16)
4168
101
        continuity_counter_ = 0;
4169
102
    return prev;
4170
103
}
4171
104
4172
105
void MPEGTSPacketizer::Track::SubmitCSD(const video::Buffer::Ptr &buffer) {
4173
106
    if (!IsH264())
4174
107
        return;
4175
108
4176
109
    const uint8_t *data = buffer->Data();
4177
110
    size_t size = buffer->Length();
4178
111
4179
112
    const uint8_t *nal_start;
4180
113
    size_t nal_size;
4181
114
4182
115
    while (mcs::video::GetNextNALUnit(&data, &size, &nal_start, &nal_size, true)) {
4183
116
        auto csd = mcs::video::Buffer::Create(nal_size + 4);
4184
117
4185
118
        ::memcpy(csd->Data(), "\x00\x00\x00\x01", 4);
4186
119
        ::memcpy(csd->Data() + 4, nal_start, nal_size);
4187
120
4188
121
        csd_.push_back(csd);
4189
122
    }
4190
123
}
4191
124
4192
125
mcs::video::Buffer::Ptr MPEGTSPacketizer::Track::PrependCSD(const mcs::video::Buffer::Ptr &buffer) const {
4193
126
    size_t size = 0;
4194
127
    for (auto csd : csd_)
4195
128
        size += csd->Length();
4196
129
4197
130
    auto new_buffer = mcs::video::Buffer::Create(buffer->Length() + size);
4198
131
    size_t offset = 0;
4199
132
    for (auto csd : csd_) {
4200
133
        ::memcpy(new_buffer->Data() + offset, csd->Data(), csd->Length());
4201
134
        offset += csd->Length();
4202
135
    }
4203
136
4204
137
    ::memcpy(new_buffer->Data() + offset, buffer->Data(), buffer->Length());
4205
138
4206
139
    return new_buffer;
4207
140
}
4208
141
4209
142
void MPEGTSPacketizer::Track::Finalize() {
4210
143
    if (finalized_)
4211
144
        return;
4212
145
4213
146
    if(!IsH264())
4214
147
        return;
4215
148
4216
149
    MCS_DEBUG("");
4217
150
4218
151
    {
4219
152
        // AVC video descriptor (40)
4220
153
        auto descriptor = mcs::video::Buffer::Create(6);
4221
154
        uint8_t *data = descriptor->Data();
4222
155
        data[0] = 40;  // descriptor_tag
4223
156
        data[1] = 4;  // descriptor_length
4224
157
4225
158
        if (csd_.size() > 0) {
4226
159
            // Seems to be a conventation that the first NAL we get
4227
160
            // submitted as part of the codec-specific data is the
4228
161
            // SPS we want here.
4229
162
            auto sps = csd_.at(0);
4230
163
            // We skip the first four bytes (NAL preamble) and then
4231
164
            // just copy profile/constraint/level settings
4232
165
            memcpy(&data[2], sps->Data() + 4, 3);
4233
166
        }
4234
167
        else {
4235
168
            data[2] = format_.profile_idc;    // profile_idc
4236
169
            data[3] = format_.constraint_set; // constraint_set*
4237
170
            data[4] = format_.level_idc;      // level_idc
4238
171
        }
4239
172
4240
173
        // AVC_still_present=0, AVC_24_hour_picture_flag=0, reserved
4241
174
        data[5] = 0x3f;
4242
175
4243
176
        descriptors_.push_back(descriptor);
4244
177
    }
4245
178
    {
4246
179
        // AVC timing and HRD descriptor (42)
4247
180
4248
181
        auto descriptor = mcs::video::Buffer::Create(4);
4249
182
        uint8_t *data = descriptor->Data();
4250
183
        data[0] = 42;  // descriptor_tag
4251
184
        data[1] = 2;  // descriptor_length
4252
185
4253
186
        // hrd_management_valid_flag = 0
4254
187
        // reserved = 111111b
4255
188
        // picture_and_timing_info_present = 0
4256
189
4257
190
        data[2] = 0x7e;
4258
191
4259
192
        // fixed_frame_rate_flag = 0
4260
193
        // temporal_poc_flag = 0
4261
194
        // picture_to_display_conversion_flag = 0
4262
195
        // reserved = 11111b
4263
196
        data[3] = 0x1f;
4264
197
4265
198
        descriptors_.push_back(descriptor);
4266
199
    }
4267
200
4268
201
    finalized_ = true;
4269
202
}
4270
203
4271
204
MPEGTSPacketizer::Ptr MPEGTSPacketizer::Create() {
4272
205
    return std::shared_ptr<MPEGTSPacketizer>(new MPEGTSPacketizer);
4273
206
}
4274
207
4275
208
MPEGTSPacketizer::MPEGTSPacketizer() :
4276
209
    pat_continuity_counter_(0),
4277
210
    pmt_continuity_counter_(0) {
4278
211
    InitCrcTable();
4279
212
}
4280
213
4281
214
MPEGTSPacketizer::~MPEGTSPacketizer() {
4282
215
}
4283
216
4284
217
MPEGTSPacketizer::TrackId MPEGTSPacketizer::AddTrack(const TrackFormat &format) {
4285
218
    auto is_video = mcs::Utils::StringStartsWith(format.mime, "video/");
4286
219
4287
220
    if (!is_video) {
4288
221
        MCS_ERROR("Audio tracks for MPEGTS are currently not supported");
4289
222
        return TrackId(-1);
4290
223
    }
4291
224
4292
225
    if (format.mime != "video/avc") {
4293
226
        MCS_ERROR("Video formats other than video/avc are not supported");
4294
227
        return TrackId(-1);
4295
228
    }
4296
229
4297
230
    // First PID as per WiFi Display spec
4298
231
    unsigned int pid_start = 0x1011;
4299
232
    unsigned int stream_type = 0x1b;
4300
233
    unsigned int stream_id_start = 0xe0;
4301
234
    unsigned int stream_id_stop = 0xef;
4302
235
4303
236
    unsigned int num_same_tracks = 0;
4304
237
    unsigned int pid = pid_start;
4305
238
4306
239
    for (auto track : tracks_) {
4307
240
        if (track->StreamType() == stream_type)
4308
241
            num_same_tracks++;
4309
242
4310
243
        if (track->IsAudio() || track->IsVideo())
4311
244
            pid++;
4312
245
    }
4313
246
4314
247
    unsigned int stream_id = stream_id_start + num_same_tracks;
4315
248
    if (stream_id > stream_id_stop) {
4316
249
        MCS_ERROR("All stream ids are in use");
4317
250
        return TrackId(-1);
4318
251
    }
4319
252
4320
253
    auto track = Track::Create(format, pid, stream_type, stream_id);
4321
254
    tracks_.push_back(track);
4322
255
4323
256
    return tracks_.size() - 1;
4324
257
}
4325
258
4326
259
void MPEGTSPacketizer::SubmitCSD(TrackId track_index, const video::Buffer::Ptr &buffer) {
4327
260
    if (track_index > tracks_.size() -1)
4328
261
        return;
4329
262
4330
263
    auto track = tracks_.at(track_index);
4331
264
    track->SubmitCSD(buffer);
4332
265
}
4333
266
4334
267
bool MPEGTSPacketizer::Packetize(TrackId track_index, const video::Buffer::Ptr &_access_unit,
4335
268
                                 video::Buffer::Ptr *packets, int flags) {
4336
269
    size_t numStuffingBytes = 0;
4337
270
    const uint8_t *PES_private_data = nullptr;
4338
271
    size_t PES_private_data_len = 0;
4339
272
    mcs::video::Buffer::Ptr access_unit = _access_unit;
4340
273
    int64_t timeUs = access_unit->Timestamp();
4341
274
4342
275
    packets->reset();
4343
276
4344
277
    if (track_index > tracks_.size() - 1) {
4345
278
        MCS_ERROR("Invalid track index %d supplied", track_index);
4346
279
        return false;
4347
280
    }
4348
281
4349
282
    auto track = tracks_.at(track_index);
4350
283
4351
284
    if (track->IsH264() && (flags & Flags::kPrependSPSandPPStoIDRFrames)
4352
285
            && mcs::video::DoesBufferContainIDRFrame(access_unit)) {
4353
286
        // prepend codec specific data, i.e. SPS and PPS.
4354
287
        access_unit = track->PrependCSD(access_unit);
4355
288
    }
4356
289
4357
290
    // 0x47
4358
291
    // transport_error_indicator = b0
4359
292
    // payload_unit_start_indicator = b1
4360
293
    // transport_priority = b0
4361
294
    // PID
4362
295
    // transport_scrambling_control = b00
4363
296
    // adaptation_field_control = b??
4364
297
    // continuity_counter = b????
4365
298
    // -- payload follows
4366
299
    // packet_startcode_prefix = 0x000001
4367
300
    // stream_id
4368
301
    // PES_packet_length = 0x????
4369
302
    // reserved = b10
4370
303
    // PES_scrambling_control = b00
4371
304
    // PES_priority = b0
4372
305
    // data_alignment_indicator = b1
4373
306
    // copyright = b0
4374
307
    // original_or_copy = b0
4375
308
    // PTS_DTS_flags = b10  (PTS only)
4376
309
    // ESCR_flag = b0
4377
310
    // ES_rate_flag = b0
4378
311
    // DSM_trick_mode_flag = b0
4379
312
    // additional_copy_info_flag = b0
4380
313
    // PES_CRC_flag = b0
4381
314
    // PES_extension_flag = b0
4382
315
    // PES_header_data_length = 0x05
4383
316
    // reserved = b0010 (PTS)
4384
317
    // PTS[32..30] = b???
4385
318
    // reserved = b1
4386
319
    // PTS[29..15] = b??? ???? ???? ???? (15 bits)
4387
320
    // reserved = b1
4388
321
    // PTS[14..0] = b??? ???? ???? ???? (15 bits)
4389
322
    // reserved = b1
4390
323
    // the first fragment of "buffer" follows
4391
324
4392
325
    // Each transport packet (except for the last one contributing to the PES
4393
326
    // payload) must contain a multiple of 16 bytes of payload per HDCP spec.
4394
327
    bool alignPayload = false;
4395
328
4396
329
    /*
4397
330
       a) The very first PES transport stream packet contains
4398
331
4399
332
       4 bytes of TS header
4400
333
       ... padding
4401
334
       14 bytes of static PES header
4402
335
       PES_private_data_len + 1 bytes (only if PES_private_data_len > 0)
4403
336
       numStuffingBytes bytes
4404
337
4405
338
       followed by the payload
4406
339
4407
340
       b) Subsequent PES transport stream packets contain
4408
341
4409
342
       4 bytes of TS header
4410
343
       ... padding
4411
344
4412
345
       followed by the payload
4413
346
    */
4414
347
4415
348
    size_t PES_packet_length = access_unit->Length() + 8 + numStuffingBytes;
4416
349
    if (PES_private_data_len > 0)
4417
350
        PES_packet_length += PES_private_data_len + 1;
4418
351
4419
352
    size_t numTSPackets = 1;
4420
353
4421
354
    {
4422
355
        // Make sure the PES header fits into a single TS packet:
4423
356
        size_t PES_header_size = 14 + numStuffingBytes;
4424
357
        if (PES_private_data_len > 0) {
4425
358
            PES_header_size += PES_private_data_len + 1;
4426
359
        }
4427
360
4428
361
        if (PES_header_size > 188u - 4u)
4429
362
            MCS_FATAL("Invalid header size");
4430
363
4431
364
        size_t sizeAvailableForPayload = 188 - 4 - PES_header_size;
4432
365
        size_t numBytesOfPayload = access_unit->Length();
4433
366
4434
367
        if (numBytesOfPayload > sizeAvailableForPayload) {
4435
368
            numBytesOfPayload = sizeAvailableForPayload;
4436
369
4437
370
            if (alignPayload && numBytesOfPayload > 16) {
4438
371
                numBytesOfPayload -= (numBytesOfPayload % 16);
4439
372
            }
4440
373
        }
4441
374
4442
375
        size_t numBytesOfPayloadRemaining = access_unit->Length() - numBytesOfPayload;
4443
376
4444
377
        // This is how many bytes of payload each subsequent TS packet
4445
378
        // can contain at most.
4446
379
        sizeAvailableForPayload = 188 - 4;
4447
380
        size_t sizeAvailableForAlignedPayload = sizeAvailableForPayload;
4448
381
        if (alignPayload) {
4449
382
            // We're only going to use a subset of the available space
4450
383
            // since we need to make each fragment a multiple of 16 in size.
4451
384
            sizeAvailableForAlignedPayload -=
4452
385
                (sizeAvailableForAlignedPayload % 16);
4453
386
        }
4454
387
4455
388
        size_t numFullTSPackets =
4456
389
            numBytesOfPayloadRemaining / sizeAvailableForAlignedPayload;
4457
390
4458
391
        numTSPackets += numFullTSPackets;
4459
392
4460
393
        numBytesOfPayloadRemaining -=
4461
394
            numFullTSPackets * sizeAvailableForAlignedPayload;
4462
395
4463
396
        // numBytesOfPayloadRemaining < sizeAvailableForAlignedPayload
4464
397
        if (numFullTSPackets == 0 && numBytesOfPayloadRemaining > 0) {
4465
398
            // There wasn't enough payload left to form a full aligned payload,
4466
399
            // the last packet doesn't have to be aligned.
4467
400
            ++numTSPackets;
4468
401
        } else if (numFullTSPackets > 0
4469
402
                && numBytesOfPayloadRemaining
4470
403
                    + sizeAvailableForAlignedPayload > sizeAvailableForPayload) {
4471
404
            // The last packet emitted had a full aligned payload and together
4472
405
            // with the bytes remaining does exceed the unaligned payload
4473
406
            // size, so we need another packet.
4474
407
            ++numTSPackets;
4475
408
        }
4476
409
    }
4477
410
4478
411
    if (flags & Flags::kEmitPATandPMT)
4479
412
        numTSPackets += 2;
4480
413
4481
414
    if (flags & Flags::kEmitPCR)
4482
415
        ++numTSPackets;
4483
416
4484
417
    auto buffer = mcs::video::Buffer::Create(numTSPackets * 188);
4485
418
    buffer->SetTimestamp(access_unit->Timestamp());
4486
419
4487
420
    uint8_t *packetDataStart = buffer->Data();
4488
421
4489
422
    if (flags & Flags::kEmitPATandPMT) {
4490
423
        // Program Association Table (PAT):
4491
424
        // 0x47
4492
425
        // transport_error_indicator = b0
4493
426
        // payload_unit_start_indicator = b1
4494
427
        // transport_priority = b0
4495
428
        // PID = b0000000000000 (13 bits)
4496
429
        // transport_scrambling_control = b00
4497
430
        // adaptation_field_control = b01 (no adaptation field, payload only)
4498
431
        // continuity_counter = b????
4499
432
        // skip = 0x00
4500
433
        // --- payload follows
4501
434
        // table_id = 0x00
4502
435
        // section_syntax_indicator = b1
4503
436
        // must_be_zero = b0
4504
437
        // reserved = b11
4505
438
        // section_length = 0x00d
4506
439
        // transport_stream_id = 0x0000
4507
440
        // reserved = b11
4508
441
        // version_number = b00001
4509
442
        // current_next_indicator = b1
4510
443
        // section_number = 0x00
4511
444
        // last_section_number = 0x00
4512
445
        //   one program follows:
4513
446
        //   program_number = 0x0001
4514
447
        //   reserved = b111
4515
448
        //   program_map_PID = kPID_PMT (13 bits!)
4516
449
        // CRC = 0x????????
4517
450
4518
451
        if (++pat_continuity_counter_ == 16)
4519
452
            pat_continuity_counter_ = 0;
4520
453
4521
454
        uint8_t *ptr = packetDataStart;
4522
455
        *ptr++ = 0x47;
4523
456
        *ptr++ = 0x40;
4524
457
        *ptr++ = 0x00;
4525
458
        *ptr++ = 0x10 | pat_continuity_counter_;
4526
459
        *ptr++ = 0x00;
4527
460
4528
461
        uint8_t *crcDataStart = ptr;
4529
462
        *ptr++ = 0x00;
4530
463
        *ptr++ = 0xb0;
4531
464
        *ptr++ = 0x0d;
4532
465
        *ptr++ = 0x00;
4533
466
        *ptr++ = 0x00;
4534
467
        *ptr++ = 0xc3;
4535
468
        *ptr++ = 0x00;
4536
469
        *ptr++ = 0x00;
4537
470
        *ptr++ = 0x00;
4538
471
        *ptr++ = 0x01;
4539
472
        *ptr++ = 0xe0 | (kPIDofPMT >> 8);
4540
473
        *ptr++ = kPIDofPMT & 0xff;
4541
474
4542
475
        if (ptr - crcDataStart != 12)
4543
476
            MCS_FATAL("Invalid position for ptr");
4544
477
4545
478
        uint32_t crc = ::htonl(CalcCrc32(crcDataStart, ptr - crcDataStart));
4546
479
        ::memcpy(ptr, &crc, 4);
4547
480
        ptr += 4;
4548
481
4549
482
        size_t sizeLeft = packetDataStart + 188 - ptr;
4550
483
        ::memset(ptr, 0xff, sizeLeft);
4551
484
4552
485
        packetDataStart += 188;
4553
486
4554
487
        // Program Map (PMT):
4555
488
        // 0x47
4556
489
        // transport_error_indicator = b0
4557
490
        // payload_unit_start_indicator = b1
4558
491
        // transport_priority = b0
4559
492
        // PID = kPID_PMT (13 bits)
4560
493
        // transport_scrambling_control = b00
4561
494
        // adaptation_field_control = b01 (no adaptation field, payload only)
4562
495
        // continuity_counter = b????
4563
496
        // skip = 0x00
4564
497
        // -- payload follows
4565
498
        // table_id = 0x02
4566
499
        // section_syntax_indicator = b1
4567
500
        // must_be_zero = b0
4568
501
        // reserved = b11
4569
502
        // section_length = 0x???
4570
503
        // program_number = 0x0001
4571
504
        // reserved = b11
4572
505
        // version_number = b00001
4573
506
        // current_next_indicator = b1
4574
507
        // section_number = 0x00
4575
508
        // last_section_number = 0x00
4576
509
        // reserved = b111
4577
510
        // PCR_PID = kPCR_PID (13 bits)
4578
511
        // reserved = b1111
4579
512
        // program_info_length = 0x???
4580
513
        //   program_info_descriptors follow
4581
514
        // one or more elementary stream descriptions follow:
4582
515
        //   stream_type = 0x??
4583
516
        //   reserved = b111
4584
517
        //   elementary_PID = b? ???? ???? ???? (13 bits)
4585
518
        //   reserved = b1111
4586
519
        //   ES_info_length = 0x000
4587
520
        // CRC = 0x????????
4588
521
4589
522
        if (++pmt_continuity_counter_ == 16)
4590
523
            pmt_continuity_counter_ = 0;
4591
524
4592
525
        ptr = packetDataStart;
4593
526
4594
527
        *ptr++ = 0x47;
4595
528
        *ptr++ = 0x40 | (kPIDofPMT >> 8);
4596
529
        *ptr++ = kPIDofPMT & 0xff;
4597
530
        *ptr++ = 0x10 | pmt_continuity_counter_;
4598
531
        *ptr++ = 0x00;
4599
532
4600
533
        crcDataStart = ptr;
4601
534
        *ptr++ = 0x02;
4602
535
4603
536
        *ptr++ = 0x00;  // section_length to be filled in below.
4604
537
        *ptr++ = 0x00;
4605
538
4606
539
        *ptr++ = 0x00;
4607
540
        *ptr++ = 0x01;
4608
541
        *ptr++ = 0xc3;
4609
542
        *ptr++ = 0x00;
4610
543
        *ptr++ = 0x00;
4611
544
        *ptr++ = 0xe0 | (kPIDofPCR >> 8);
4612
545
        *ptr++ = kPIDofPCR & 0xff;
4613
546
4614
547
        size_t program_info_length = 0;
4615
548
        for (auto descriptor : program_info_descriptors_)
4616
549
            program_info_length += descriptor->Length();
4617
550
4618
551
        if(program_info_length >= 0x400)
4619
552
            MCS_FATAL("Invalid length for program info");
4620
553
4621
554
        *ptr++ = 0xf0 | (program_info_length >> 8);
4622
555
        *ptr++ = (program_info_length & 0xff);
4623
556
4624
557
        for (auto descriptor : program_info_descriptors_) {
4625
558
            ::memcpy(ptr, descriptor->Data(), descriptor->Length());
4626
559
            ptr += descriptor->Length();
4627
560
        }
4628
561
4629
562
        for (auto track : tracks_) {
4630
563
            // Make sure all the decriptors have been added.
4631
564
            track->Finalize();
4632
565
4633
566
            *ptr++ = track->StreamType();
4634
567
            *ptr++ = 0xe0 | (track->PID() >> 8);
4635
568
            *ptr++ = track->PID() & 0xff;
4636
569
4637
570
            auto descriptors = track->Descriptors();
4638
571
4639
572
            size_t ES_info_length = 0;
4640
573
            for (auto descriptor : descriptors)
4641
574
                ES_info_length += descriptor->Length();
4642
575
4643
576
            if (ES_info_length > 0xfff)
4644
577
                MCS_FATAL("Invalid ES length %d", ES_info_length);
4645
578
4646
579
            *ptr++ = 0xf0 | (ES_info_length >> 8);
4647
580
            *ptr++ = (ES_info_length & 0xff);
4648
581
4649
582
            for (auto descriptor : descriptors) {
4650
583
                memcpy(ptr, descriptor->Data(), descriptor->Length());
4651
584
                ptr += descriptor->Length();
4652
585
            }
4653
586
        }
4654
587
4655
588
        size_t section_length = ptr - (crcDataStart + 3) + 4 /* CRC */;
4656
589
4657
590
        crcDataStart[1] = 0xb0 | (section_length >> 8);
4658
591
        crcDataStart[2] = section_length & 0xff;
4659
592
4660
593
        crc = ::htonl(CalcCrc32(crcDataStart, ptr - crcDataStart));
4661
594
        memcpy(ptr, &crc, 4);
4662
595
        ptr += 4;
4663
596
4664
597
        sizeLeft = packetDataStart + 188 - ptr;
4665
598
        memset(ptr, 0xff, sizeLeft);
4666
599
4667
600
        packetDataStart += 188;
4668
601
    }
4669
602
4670
603
    if (flags & Flags::kEmitPCR) {
4671
604
        // PCR stream
4672
605
        // 0x47
4673
606
        // transport_error_indicator = b0
4674
607
        // payload_unit_start_indicator = b1
4675
608
        // transport_priority = b0
4676
609
        // PID = kPCR_PID (13 bits)
4677
610
        // transport_scrambling_control = b00
4678
611
        // adaptation_field_control = b10 (adaptation field only, no payload)
4679
612
        // continuity_counter = b0000 (does not increment)
4680
613
        // adaptation_field_length = 183
4681
614
        // discontinuity_indicator = b0
4682
615
        // random_access_indicator = b0
4683
616
        // elementary_stream_priority_indicator = b0
4684
617
        // PCR_flag = b1
4685
618
        // OPCR_flag = b0
4686
619
        // splicing_point_flag = b0
4687
620
        // transport_private_data_flag = b0
4688
621
        // adaptation_field_extension_flag = b0
4689
622
        // program_clock_reference_base = b?????????????????????????????????
4690
623
        // reserved = b111111
4691
624
        // program_clock_reference_extension = b?????????
4692
625
4693
626
        int64_t nowUs = mcs::Utils::GetNowUs();
4694
627
        uint64_t PCR = nowUs * 27;  // PCR based on a 27MHz clock
4695
628
        uint64_t PCR_base = PCR / 300;
4696
629
        uint32_t PCR_ext = PCR % 300;
4697
630
4698
631
        uint8_t *ptr = packetDataStart;
4699
632
        *ptr++ = 0x47;
4700
633
        *ptr++ = 0x40 | (kPIDofPCR >> 8);
4701
634
        *ptr++ = kPIDofPCR & 0xff;
4702
635
        *ptr++ = 0x20;
4703
636
        *ptr++ = 0xb7;  // adaptation_field_length
4704
637
        *ptr++ = 0x10;
4705
638
        *ptr++ = (PCR_base >> 25) & 0xff;
4706
639
        *ptr++ = (PCR_base >> 17) & 0xff;
4707
640
        *ptr++ = (PCR_base >> 9) & 0xff;
4708
641
        *ptr++ = ((PCR_base & 1) << 7) | 0x7e | ((PCR_ext >> 8) & 1);
4709
642
        *ptr++ = (PCR_ext & 0xff);
4710
643
4711
644
        size_t sizeLeft = packetDataStart + 188 - ptr;
4712
645
        ::memset(ptr, 0xff, sizeLeft);
4713
646
4714
647
        packetDataStart += 188;
4715
648
    }
4716
649
4717
650
    // Adjust time to 90kHz
4718
651
    uint64_t PTS = (timeUs * 9ll) / 100ll;
4719
652
4720
653
    if (PES_packet_length >= 65536) {
4721
654
        // This really should only happen for video.
4722
655
        if (!track->IsVideo())
4723
656
            MCS_FATAL("PES packet length too hight; should only happen for video (track %d mime %s)",
4724
657
                      track_index, track->Format().mime);
4725
658
4726
659
        MCS_WARNING("Reset PES packet length to 0");
4727
660
4728
661
        // It's valid to set this to 0 for video according to the specs.
4729
662
        PES_packet_length = 0;
4730
663
    }
4731
664
4732
665
    size_t sizeAvailableForPayload = 188 - 4 - 14 - numStuffingBytes;
4733
666
    if (PES_private_data_len > 0) {
4734
667
        sizeAvailableForPayload -= PES_private_data_len + 1;
4735
668
    }
4736
669
4737
670
    size_t copy = access_unit->Length();
4738
671
4739
672
    if (copy > sizeAvailableForPayload) {
4740
673
        copy = sizeAvailableForPayload;
4741
674
4742
675
        if (alignPayload && copy > 16) {
4743
676
            copy -= (copy % 16);
4744
677
        }
4745
678
    }
4746
679
4747
680
    size_t numPaddingBytes = sizeAvailableForPayload - copy;
4748
681
4749
682
    uint8_t *ptr = packetDataStart;
4750
683
    *ptr++ = 0x47;
4751
684
    *ptr++ = 0x40 | (track->PID() >> 8);
4752
685
    *ptr++ = track->PID() & 0xff;
4753
686
4754
687
    *ptr++ = (numPaddingBytes > 0 ? 0x30 : 0x10)
4755
688
                | track->NextContinuityCounter();
4756
689
4757
690
    if (numPaddingBytes > 0) {
4758
691
        *ptr++ = numPaddingBytes - 1;
4759
692
        if (numPaddingBytes >= 2) {
4760
693
            *ptr++ = 0x00;
4761
694
            ::memset(ptr, 0xff, numPaddingBytes - 2);
4762
695
            ptr += numPaddingBytes - 2;
4763
696
        }
4764
697
    }
4765
698
4766
699
    *ptr++ = 0x00;
4767
700
    *ptr++ = 0x00;
4768
701
    *ptr++ = 0x01;
4769
702
    *ptr++ = track->StreamId();
4770
703
    *ptr++ = PES_packet_length >> 8;
4771
704
    *ptr++ = PES_packet_length & 0xff;
4772
705
    *ptr++ = 0x84;
4773
706
    *ptr++ = (PES_private_data_len > 0) ? 0x81 : 0x80;
4774
707
4775
708
    size_t headerLength = 0x05 + numStuffingBytes;
4776
709
    if (PES_private_data_len > 0) {
4777
710
        headerLength += 1 + PES_private_data_len;
4778
711
    }
4779
712
4780
713
    *ptr++ = headerLength;
4781
714
4782
715
    *ptr++ = 0x20 | (((PTS >> 30) & 7) << 1) | 1;
4783
716
    *ptr++ = (PTS >> 22) & 0xff;
4784
717
    *ptr++ = (((PTS >> 15) & 0x7f) << 1) | 1;
4785
718
    *ptr++ = (PTS >> 7) & 0xff;
4786
719
    *ptr++ = ((PTS & 0x7f) << 1) | 1;
4787
720
4788
721
    if (PES_private_data_len > 0) {
4789
722
        *ptr++ = 0x8e;  // PES_private_data_flag, reserved.
4790
723
        ::memcpy(ptr, PES_private_data, PES_private_data_len);
4791
724
        ptr += PES_private_data_len;
4792
725
    }
4793
726
4794
727
    for (size_t i = 0; i < numStuffingBytes; ++i) {
4795
728
        *ptr++ = 0xff;
4796
729
    }
4797
730
4798
731
    ::memcpy(ptr, access_unit->Data(), copy);
4799
732
    ptr += copy;
4800
733
4801
734
    if (ptr != packetDataStart + 188)
4802
735
        MCS_FATAL("Invalid pointer %p", ptr);
4803
736
4804
737
    packetDataStart += 188;
4805
738
4806
739
    size_t offset = copy;
4807
740
    while (offset < access_unit->Length()) {
4808
741
        // for subsequent fragments of "buffer":
4809
742
        // 0x47
4810
743
        // transport_error_indicator = b0
4811
744
        // payload_unit_start_indicator = b0
4812
745
        // transport_priority = b0
4813
746
        // PID = b0 0001 1110 ???? (13 bits) [0x1e0 + 1 + sourceIndex]
4814
747
        // transport_scrambling_control = b00
4815
748
        // adaptation_field_control = b??
4816
749
        // continuity_counter = b????
4817
750
        // the fragment of "buffer" follows.
4818
751
4819
752
        size_t sizeAvailableForPayload = 188 - 4;
4820
753
4821
754
        size_t copy = access_unit->Length() - offset;
4822
755
4823
756
        if (copy > sizeAvailableForPayload) {
4824
757
            copy = sizeAvailableForPayload;
4825
758
4826
759
            if (alignPayload && copy > 16) {
4827
760
                copy -= (copy % 16);
4828
761
            }
4829
762
        }
4830
763
4831
764
        size_t numPaddingBytes = sizeAvailableForPayload - copy;
4832
765
4833
766
        uint8_t *ptr = packetDataStart;
4834
767
        *ptr++ = 0x47;
4835
768
        *ptr++ = 0x00 | (track->PID() >> 8);
4836
769
        *ptr++ = track->PID() & 0xff;
4837
770
4838
771
        *ptr++ = (numPaddingBytes > 0 ? 0x30 : 0x10)
4839
772
                    | track->NextContinuityCounter();
4840
773
4841
774
        if (numPaddingBytes > 0) {
4842
775
            *ptr++ = numPaddingBytes - 1;
4843
776
            if (numPaddingBytes >= 2) {
4844
777
                *ptr++ = 0x00;
4845
778
                memset(ptr, 0xff, numPaddingBytes - 2);
4846
779
                ptr += numPaddingBytes - 2;
4847
780
            }
4848
781
        }
4849
782
4850
783
        memcpy(ptr, access_unit->Data() + offset, copy);
4851
784
        ptr += copy;
4852
785
        if (ptr != packetDataStart + 188)
4853
786
            MCS_FATAL("Invalid pointer position %p", ptr);
4854
787
4855
788
        offset += copy;
4856
789
        packetDataStart += 188;
4857
790
    }
4858
791
4859
792
    if (packetDataStart != buffer->Data() + buffer->Length())
4860
793
        MCS_FATAL("Invalid packet start position");
4861
794
4862
795
    *packets = buffer;
4863
796
4864
797
#if 0
4865
798
    auto now = mcs::Utils::GetNowUs();
4866
799
    MCS_DEBUG("Buffer packtized after %lld ms (timestamp %lld now %lld)",
4867
800
              (now - buffer->Timestamp()) / 1000ll,
4868
801
              buffer->Timestamp(), now);
4869
802
#endif
4870
803
4871
804
    return true;
4872
805
}
4873
806
4874
807
void MPEGTSPacketizer::InitCrcTable() {
4875
808
    uint32_t poly = 0x04C11DB7;
4876
809
4877
810
    for (int i = 0; i < 256; i++) {
4878
811
        uint32_t crc = i << 24;
4879
812
        for (int j = 0; j < 8; j++) {
4880
813
            crc = (crc << 1) ^ ((crc & 0x80000000) ? (poly) : 0);
4881
814
        }
4882
815
        crc_table_[i] = crc;
4883
816
    }
4884
817
}
4885
818
4886
819
uint32_t MPEGTSPacketizer::CalcCrc32(const uint8_t *start, size_t size) const {
4887
820
    uint32_t crc = 0xFFFFFFFF;
4888
821
    const uint8_t *p;
4889
822
4890
823
    for (p = start; p < start + size; ++p) {
4891
824
        crc = (crc << 8) ^ crc_table_[((crc >> 24) ^ *p) & 0xFF];
4892
825
    }
4893
826
4894
827
    return crc;
4895
828
}
4896
829
4897
830
} // namespace streaming
4898
831
} // namespace mcs
4899
0
832
4900
=== added file 'src/mcs/streaming/mpegtspacketizer.h'
4901
--- src/mcs/streaming/mpegtspacketizer.h	1970-01-01 00:00:00 +0000
4902
+++ src/mcs/streaming/mpegtspacketizer.h	2016-02-25 12:47:02 +0000
4903
@@ -0,0 +1,97 @@
4904
1
/*
4905
2
 * Copyright 2012, The Android Open Source Project
4906
3
 * Copyright (C) 2016 Canonical, Ltd.
4907
4
 *
4908
5
 * Licensed under the Apache License, Version 2.0 (the "License");
4909
6
 * you may not use this file except in compliance with the License.
4910
7
 * You may obtain a copy of the License at
4911
8
 *
4912
9
 *     http://www.apache.org/licenses/LICENSE-2.0
4913
10
 *
4914
11
 * Unless required by applicable law or agreed to in writing, software
4915
12
 * distributed under the License is distributed on an "AS IS" BASIS,
4916
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
4917
14
 * See the License for the specific language governing permissions and
4918
15
 * limitations under the License.
4919
16
 */
4920
17
4921
18
#ifndef MCS_STREAMING_MPEGTSPACKETIZER_H_
4922
19
#define MCS_STREAMING_MPEGTSPACKETIZER_H_
4923
20
4924
21
#include <memory>
4925
22
#include <vector>
4926
23
4927
24
#include <mcs/video/buffer.h>
4928
25
4929
26
namespace mcs {
4930
27
namespace streaming {
4931
28
4932
29
class MPEGTSPacketizer {
4933
30
public:
4934
31
    typedef std::shared_ptr<MPEGTSPacketizer> Ptr;
4935
32
    typedef int TrackId;
4936
33
4937
34
    enum Flags {
4938
35
        kEmitPATandPMT = 1,
4939
36
        kEmitPCR = 2,
4940
37
        kIsEncrypted = 4,
4941
38
        kPrependSPSandPPStoIDRFrames = 8,
4942
39
    };
4943
40
4944
41
    struct TrackFormat {
4945
42
    public:
4946
43
        TrackFormat(const std::string &mime = "",
4947
44
                    unsigned int profile_idc = 0,
4948
45
                    unsigned int level_idc = 0,
4949
46
                    unsigned int constraint_set = 0) :
4950
47
            mime(mime),
4951
48
            profile_idc(profile_idc),
4952
49
            level_idc(level_idc),
4953
50
            constraint_set(constraint_set) {
4954
51
        }
4955
52
        TrackFormat(const TrackFormat &other) :
4956
53
            mime(other.mime),
4957
54
            profile_idc(other.profile_idc),
4958
55
            level_idc(other.level_idc),
4959
56
            constraint_set(other.constraint_set) {
4960
57
        }
4961
58
4962
59
        std::string mime;
4963
60
        unsigned int profile_idc;
4964
61
        unsigned int level_idc;
4965
62
        unsigned int constraint_set;
4966
63
    };
4967
64
4968
65
    static Ptr Create();
4969
66
4970
67
    ~MPEGTSPacketizer();
4971
68
4972
69
    TrackId AddTrack(const TrackFormat &format);
4973
70
4974
71
    void SubmitCSD(TrackId track_index, const video::Buffer::Ptr &buffer);
4975
72
4976
73
    bool Packetize(TrackId track_index, const video::Buffer::Ptr &access_unit,
4977
74
                   video::Buffer::Ptr *packets, int flags = 0);
4978
75
4979
76
private:
4980
77
    MPEGTSPacketizer();
4981
78
4982
79
private:
4983
80
    void InitCrcTable();
4984
81
    uint32_t CalcCrc32(const uint8_t *start, size_t size) const;
4985
82
4986
83
private:
4987
84
    struct Track;
4988
85
4989
86
private:
4990
87
    unsigned int pat_continuity_counter_;
4991
88
    unsigned int pmt_continuity_counter_;
4992
89
    uint32_t crc_table_[256];
4993
90
    std::vector<std::shared_ptr<Track>> tracks_;
4994
91
    std::vector<video::Buffer::Ptr> program_info_descriptors_;
4995
92
};
4996
93
4997
94
} // namespace streaming
4998
95
} // namespace mcs
4999
96
5000
97
#endif
Status:	Superseded
Proposed branch:	lp:~morphis/aethercast/hw-encoding-support
Merge into:	lp:aethercast
Prerequisite:	lp:~morphis/aethercast/use-wpa-dbus
Diff against target:	20315 lines (+8563/-6702) 191 files modified .gitignore (+1/-0) CMakeLists.txt (+14/-1) cmake/LinuxCrossCompile.cmake (+43/-0) conf/dhcpd.conf (+0/-5) cross-compile-chroot.sh (+163/-0) data/fi.w1.wpa_supplicant1.xml (+0/-109) data/org.aethercast.xml (+2/-0) debian/aethercast-tools.install (+1/-0) debian/aethercast.install (+0/-1) debian/control (+26/-3) debian/rules (+4/-0) debian/usr.sbin.aethercast (+13/-9) scripts/setup-partial-armhf-chroot.sh (+155/-0) src/CMakeLists.txt (+63/-18) src/mcs/android/h264encoder.cpp (+464/-0) src/mcs/android/h264encoder.h (+96/-0) src/mcs/basesourcemediamanager.cpp (+59/-26) src/mcs/basesourcemediamanager.h (+8/-3) src/mcs/config.h.in (+0/-25) src/mcs/forwardingmiracastcontroller.cpp (+6/-2) src/mcs/forwardingmiracastcontroller.h (+3/-1) src/mcs/forwardingnetworkdevice.cpp (+0/-51) src/mcs/forwardingnetworkdevice.h (+0/-42) src/mcs/gstsourcemediamanager.cpp (+19/-2) src/mcs/gstsourcemediamanager.h (+2/-2) src/mcs/initgstreameronce.cpp (+88/-0) src/mcs/initgstreameronce.h (+29/-0) src/mcs/logger.cpp (+20/-2) src/mcs/logger.h (+3/-0) src/mcs/mediamanagerfactory.cpp (+8/-4) src/mcs/mediamanagerfactory.h (+1/-1) src/mcs/mir/mediasender.cpp (+155/-0) src/mcs/mir/mediasender.h (+75/-0) src/mcs/mir/sourcemediamanager.cpp (+130/-93) src/mcs/mir/sourcemediamanager.h (+50/-8) src/mcs/mir/streamconnector.cpp (+204/-0) src/mcs/mir/streamconnector.h (+77/-0) src/mcs/mir/streamrenderer.cpp (+175/-0) src/mcs/mir/streamrenderer.h (+69/-0) src/mcs/miracastcontroller.h (+3/-1) src/mcs/miracastcontrollerskeleton.cpp (+35/-1) src/mcs/miracastcontrollerskeleton.h (+2/-0) src/mcs/miracastservice.cpp (+34/-8) src/mcs/miracastservice.h (+5/-1) src/mcs/miracastsourceclient.cpp (+15/-6) src/mcs/miracastsourceclient.h (+7/-5) src/mcs/miracastsourcemanager.cpp (+6/-5) src/mcs/miracastsourcemanager.h (+3/-2) src/mcs/networkdeviceskeleton.cpp (+0/-142) src/mcs/networkutils.cpp (+61/-3) src/mcs/networkutils.h (+3/-0) src/mcs/streaming/mpegtspacketizer.cpp (+831/-0) src/mcs/streaming/mpegtspacketizer.h (+97/-0) src/mcs/streaming/rtpsender.cpp (+308/-0) src/mcs/streaming/rtpsender.h (+69/-0) src/mcs/systemcontroller.cpp (+31/-0) src/mcs/systemcontroller.h (+79/-0) src/mcs/testsourcemediamanager.cpp (+29/-4) src/mcs/types.h (+3/-0) src/mcs/ubuntu/powerd.cpp (+27/-0) src/mcs/ubuntu/powerd.h (+31/-0) src/mcs/ubuntu/powerdsystemlock.cpp (+93/-0) src/mcs/ubuntu/powerdsystemlock.h (+56/-0) src/mcs/ubuntu/systemcontroller.cpp (+42/-0) src/mcs/ubuntu/systemcontroller.h (+42/-0) src/mcs/ubuntu/unity.cpp (+28/-0) src/mcs/ubuntu/unity.h (+33/-0) src/mcs/ubuntu/unitydisplaylock.cpp (+128/-0) src/mcs/ubuntu/unitydisplaylock.h (+56/-0) src/mcs/utils.cpp (+57/-2) src/mcs/utils.h (+19/-1) src/mcs/video/baseencoder.cpp (+33/-0) src/mcs/video/baseencoder.h (+112/-0) src/mcs/video/buffer.cpp (+99/-0) src/mcs/video/buffer.h (+83/-0) src/mcs/video/bufferqueue.cpp (+131/-0) src/mcs/video/bufferqueue.h (+76/-0) src/mcs/video/h264analyzer.cpp (+115/-0) src/mcs/video/h264analyzer.h (+60/-0) src/mcs/video/statistics.cpp (+134/-0) src/mcs/video/statistics.h (+74/-0) src/mcs/video/utils.cpp (+39/-0) src/mcs/video/utils.h (+33/-0) src/mcs/video/utils_from_android.cpp (+112/-0) src/mcs/video/videoformat.cpp (+416/-0) src/mcs/video/videoformat.h (+46/-0) src/mcs/x11sourcemediamanager.cpp (+0/-51) src/mcs/x11sourcemediamanager.h (+0/-38) src/mcs/x264.cpp (+206/-0) src/mcs/x264.h (+82/-0) src/w11tng/config.h.in (+0/-27) src/w11tng/dhcpclient.cpp (+2/-0) src/w11tng/dhcpleaseparser.cpp (+0/-130) src/w11tng/dhcpleaseparser.h (+0/-51) src/w11tng/dhcpserver.cpp (+5/-5) src/w11tng/filemonitor.cpp (+0/-74) src/w11tng/filemonitor.h (+0/-60) src/w11tng/hostname1stub.cpp (+0/-136) src/w11tng/hostname1stub.h (+0/-73) src/w11tng/informationelement.cpp (+0/-171) src/w11tng/informationelement.h (+0/-165) src/w11tng/interfaceselector.cpp (+0/-125) src/w11tng/interfaceselector.h (+0/-66) src/w11tng/interfacestub.cpp (+0/-95) src/w11tng/interfacestub.h (+0/-69) src/w11tng/managerstub.cpp (+0/-202) src/w11tng/managerstub.h (+0/-83) src/w11tng/netlinklistener.cpp (+0/-205) src/w11tng/netlinklistener.h (+0/-64) src/w11tng/networkdevice.cpp (+0/-126) src/w11tng/networkdevice.h (+0/-92) src/w11tng/networkmanager.cpp (+56/-8) src/w11tng/networkmanager.h (+19/-4) src/w11tng/p2pdevicestub.cpp (+0/-447) src/w11tng/p2pdevicestub.h (+0/-112) src/w11tng/peerstub.cpp (+0/-165) src/w11tng/peerstub.h (+0/-77) src/w11tng/processexecutor.cpp (+0/-102) src/w11tng/processexecutor.h (+0/-56) src/w11tng/wififirmwareloader.cpp (+0/-94) src/w11tng/wififirmwareloader.h (+0/-55) tests/3rd_party/lxc-nl/CMakeLists.txt (+0/-6) tests/3rd_party/lxc-nl/network.c (+0/-308) tests/3rd_party/lxc-nl/network.h (+0/-34) tests/3rd_party/lxc-nl/nl.c (+0/-313) tests/3rd_party/lxc-nl/nl.h (+0/-260) tests/CMakeLists.txt (+2/-0) tests/common/dbusfixture.cpp (+0/-190) tests/common/dbusfixture.h (+0/-67) tests/common/dbusnameowner.cpp (+0/-43) tests/common/dbusnameowner.h (+0/-44) tests/common/glibhelpers.cpp (+0/-43) tests/common/glibhelpers.h (+0/-34) tests/common/virtualnetwork.cpp (+0/-56) tests/common/virtualnetwork.h (+0/-42) tests/mcs/CMakeLists.txt (+3/-0) tests/mcs/forwardingmiracastcontroller_tests.cpp (+5/-2) tests/mcs/forwardingnetworkdevice_tests.cpp (+0/-50) tests/mcs/mediamanagerfactory_tests.cpp (+3/-3) tests/mcs/miracastcontrollerskeleton_tests.cpp (+5/-2) tests/mcs/mock_network_device.h (+0/-35) tests/mcs/networkdevice_tests.cpp (+0/-36) tests/mcs/networkdeviceskeleton_tests.cpp (+0/-51) tests/mcs/networkmanagerfactory_tests.cpp (+0/-44) tests/mcs/streaming/CMakeLists.txt (+1/-0) tests/mcs/streaming/mpegtspacketizer_tests.cpp (+44/-0) tests/mcs/video/CMakeLists.txt (+1/-0) tests/mcs/video/h264analyzer_tests.cpp (+87/-0) tests/mcs/x264_tests.cpp (+86/-0) tests/w11tng.moved/CMakeLists.txt (+14/-0) tests/w11tng.moved/baseskeleton.cpp (+58/-0) tests/w11tng.moved/baseskeleton.h (+49/-0) tests/w11tng.moved/dhcp_tests.cpp (+66/-0) tests/w11tng.moved/dhcpleaseparser_tests.cpp (+93/-0) tests/w11tng.moved/informationelement_tests.cpp (+62/-0) tests/w11tng.moved/interfaceselector_tests.cpp (+158/-0) tests/w11tng.moved/interfaceskeleton.cpp (+43/-0) tests/w11tng.moved/interfaceskeleton.h (+45/-0) tests/w11tng.moved/interfacestub_tests.cpp (+75/-0) tests/w11tng.moved/netlinklistener_tests.cpp (+67/-0) tests/w11tng.moved/p2pdeviceskeleton.cpp (+137/-0) tests/w11tng.moved/p2pdeviceskeleton.h (+72/-0) tests/w11tng.moved/p2pdevicestub_tests.cpp (+192/-0) tests/w11tng.moved/peerskeleton.cpp (+40/-0) tests/w11tng.moved/peerskeleton.h (+44/-0) tests/w11tng.moved/peerstub_tests.cpp (+73/-0) tests/w11tng/CMakeLists.txt (+0/-14) tests/w11tng/baseskeleton.cpp (+0/-58) tests/w11tng/baseskeleton.h (+0/-49) tests/w11tng/dhcpleaseparser_tests.cpp (+0/-93) tests/w11tng/informationelement_tests.cpp (+0/-62) tests/w11tng/interfaceselector_tests.cpp (+0/-158) tests/w11tng/interfaceskeleton.cpp (+0/-43) tests/w11tng/interfaceskeleton.h (+0/-45) tests/w11tng/interfacestub_tests.cpp (+0/-75) tests/w11tng/netlinklistener_tests.cpp (+0/-67) tests/w11tng/p2pdeviceskeleton.cpp (+0/-137) tests/w11tng/p2pdeviceskeleton.h (+0/-72) tests/w11tng/p2pdevicestub_tests.cpp (+0/-192) tests/w11tng/peerskeleton.cpp (+0/-40) tests/w11tng/peerskeleton.h (+0/-44) tests/w11tng/peerstub_tests.cpp (+0/-73) tests/wds/CMakeLists.txt (+1/-0) tests/wds/videoformatselection_tests.cpp (+72/-0) tools/CMakeLists.txt (+65/-0) tools/mirscreencast_to_android_hw_enc.cpp (+64/-0) tools/mirscreencast_to_stream.cpp (+124/-0) tools/mpegts_muxer.cpp (+100/-0) tools/raw_streamer.cpp (+95/-0) tools/simplesource.cpp (+73/-0) tools/simplesource.h (+52/-0)
To merge this branch:	bzr merge lp:~morphis/aethercast/hw-encoding-support
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-25
Ubuntu Phablet Team		2016-01-27	Pending
Review via email: mp+284113@code.launchpad.net