wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge b2g-inbound to m-c. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-06-26 16:55:43 -04:00
commit e1a4a6d973
28 changed files with 342 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/emulator-ics/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="7f9ec13a30f1b2cc8bdb1a199b7da54b9ab8860f"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/emulator/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>

2
b2g/config/flame/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="7f9ec13a30f1b2cc8bdb1a199b7da54b9ab8860f"/>

2
b2g/config/gaia.json
View File

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "c2a75dc08b6c97aa2fb7cdf547f7231d96381106",
"revision": "849cd3df00bea01e00f9d19a272c8e88c9571830",
"repo_path": "/integration/gaia-central"
}

2
b2g/config/hamachi/sources.xml
View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/helix/sources.xml
View File

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/nexus-4/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="7f9ec13a30f1b2cc8bdb1a199b7da54b9ab8860f"/>

2
b2g/config/wasabi/sources.xml
View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="87a7746568ac5708e828026160c0732ba252300f"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="122325e6bf9ddc0a0ac07f5148880f159b9ad023"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="bbb7659d8ea2afb396f99b3dc971ab3c42da3778"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

20
content/media/omx/RtspOmxDecoder.cpp
View File

@ -23,5 +23,25 @@ MediaDecoderStateMachine* RtspOmxDecoder::CreateStateMachine()
mResource->IsRealTime());
}
void RtspOmxDecoder::ApplyStateToStateMachine(PlayState aState)
{
MOZ_ASSERT(NS_IsMainThread());
MediaDecoder::ApplyStateToStateMachine(aState);
// Notify RTSP controller if the play state is ended.
// This is necessary for RTSP controller to transit its own state.
if (aState == PLAY_STATE_ENDED) {
nsRefPtr<RtspMediaResource> resource = mResource->GetRtspPointer();
if (resource) {
nsIStreamingProtocolController* controller =
resource->GetMediaStreamController();
if (controller) {
controller->PlaybackEnded();
}
}
}
}
} // namespace mozilla

6
content/media/omx/RtspOmxDecoder.h
View File

@ -30,8 +30,10 @@ public:
MOZ_COUNT_DTOR(RtspOmxDecoder);
}
virtual MediaDecoder* Clone() MOZ_OVERRIDE;
virtual MediaDecoderStateMachine* CreateStateMachine() MOZ_OVERRIDE;
virtual MediaDecoder* Clone() MOZ_OVERRIDE MOZ_FINAL;
virtual MediaDecoderStateMachine* CreateStateMachine() MOZ_OVERRIDE MOZ_FINAL;
virtual void ApplyStateToStateMachine(PlayState aState)
MOZ_OVERRIDE MOZ_FINAL;
};
} // namespace mozilla

1
dom/mobileconnection/interfaces/moz.build
View File

@ -9,6 +9,7 @@ XPIDL_SOURCES += [
'nsIMobileConnectionInfo.idl',
'nsIMobileConnectionProvider.idl',
'nsIMobileNetworkInfo.idl',
'nsINeighboringCellInfo.idl',
]
XPIDL_MODULE = 'dom_mobileconnection'

64
dom/mobileconnection/interfaces/nsINeighboringCellInfo.idl Normal file
View File

@ -0,0 +1,64 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsISupports.idl"
[scriptable, uuid(909f5972-c74e-44dd-b72a-7ddb62aae617)]
interface nsINeighboringCellIdsCallback : nsISupports
{
/**
* result is an array of nsINeighboringCellInfo.
*/
void notifyGetNeighboringCellIds(in jsval result);
/**
* Callback function with error message.
*/
void notifyGetNeighboringCellIdsFailed(in DOMString error);
};
[scriptable, uuid(87dc222e-abb3-4342-95bf-626aa19fa20e)]
interface nsINeighboringCellInfo: nsISupports
{
/**
* Type of radio technology.
*
* Possible values: 'gsm', 'gprs', 'edge', 'umts', 'hsdpa', 'hsupa', 'hspa',
* 'hspa+' or null (unknown).
*/
readonly attribute DOMString networkType;
/**
* Mobile Location Area Code (LAC) for GSM networks.
*
* Possible ranges from 0x0000 to 0xffff.
* -1 if the LAC is unknown.
*/
readonly attribute long gsmLocationAreaCode;
/**
* Mobile Cell ID for GSM networks.
*
* Possible ranges from 0x00000000 to 0xffffffff.
* -1 if the cell id is unknown.
*/
readonly attribute long long gsmCellId;
/**
* Primary Scrambling Code (PSC) for WCDMA networks.
*
* Possible ranges from 0x0000 to 0x01ff.
* -1 if the psc is unknown.
*/
readonly attribute long wcdmaPsc;
/**
* For GSM networks, signalStrength is the received rssi, ranging from 0 to 31.
* For WCDMA networks, signalStrength is the CPICH Received Signal Code Power,
* ranging from -120 to -25.
*
* 99 if signalStrength is unknown.
*/
readonly attribute long signalStrength;
};

43
dom/system/gonk/RadioInterfaceLayer.js
View File

@ -54,6 +54,8 @@ const GSMICCINFO_CID =
Components.ID("{d90c4261-a99d-47bc-8b05-b057bb7e8f8a}");
const CDMAICCINFO_CID =
Components.ID("{39ba3c08-aacc-46d0-8c04-9b619c387061}");
const NEIGHBORINGCELLINFO_CID =
Components.ID("{f9dfe26a-851e-4a8b-a769-cbb1baae7ded}");
const NS_XPCOM_SHUTDOWN_OBSERVER_ID = "xpcom-shutdown";
const kNetworkInterfaceStateChangedTopic = "network-interface-state-changed";
@ -1055,6 +1057,25 @@ CdmaIccInfo.prototype = {
prlVersion: 0
};
function NeighboringCellInfo() {}
NeighboringCellInfo.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsINeighboringCellInfo]),
classID: NEIGHBORINGCELLINFO_CID,
classInfo: XPCOMUtils.generateCI({
classID: NEIGHBORINGCELLINFO_CID,
classDescription: "NeighboringCellInfo",
interfaces: [Ci.nsINeighboringCellInfo]
}),
// nsINeighboringCellInfo
networkType: null,
gsmLocationAreaCode: -1,
gsmCellId: -1,
wcdmaPsc: -1,
signalStrength: 99
};
function DataConnectionHandler(clientId, radioInterface) {
// Initial owning attributes.
this.clientId = clientId;
@ -4352,6 +4373,28 @@ RadioInterface.prototype = {
} else {
this.workerMessenger.send(rilMessageType, message);
}
},
getNeighboringCellIds: function(callback) {
this.workerMessenger.send("getNeighboringCellIds",
null,
function(response) {
if (response.errorMsg) {
callback.notifyGetNeighboringCellIdsFailed(response.errorMsg);
return;
}
let neighboringCellIds = [];
let count = response.result.length;
for (let i = 0; i < count; i++) {
let srcCellInfo = response.result[i];
let cellInfo = new NeighboringCellInfo();
this.updateInfo(srcCellInfo, cellInfo);
neighboringCellIds.push(cellInfo);
}
callback.notifyGetNeighboringCellIds(neighboringCellIds);
}.bind(this));
}
};

8
dom/system/gonk/nsIRadioInterfaceLayer.idl
View File

@ -8,6 +8,7 @@
interface nsIDOMMozIccInfo;
interface nsIMobileConnectionInfo;
interface nsIMobileMessageCallback;
interface nsINeighboringCellIdsCallback;
[scriptable, uuid(6e0f45b8-410e-11e3-8c8e-b715b2cd0128)]
interface nsIRilNetworkInterface : nsINetworkInterface
@ -55,7 +56,7 @@ interface nsIRilSendWorkerMessageCallback : nsISupports
boolean handleResponse(in jsval response);
};
[scriptable, uuid(181d460e-220e-4274-8ba4-43f122eb518d)]
[scriptable, uuid(31ba65b6-05c7-4bc8-abdc-f1a219811fb4)]
interface nsIRadioInterface : nsISupports
{
readonly attribute nsIRilContext rilContext;
@ -85,6 +86,11 @@ interface nsIRadioInterface : nsISupports
[optional] in nsIRilSendWorkerMessageCallback callback);
void getSmscAddress(in nsIMobileMessageCallback request);
/**
* Cell Info functionality.
*/
void getNeighboringCellIds(in nsINeighboringCellIdsCallback callback);
};
[scriptable, uuid(d035c32e-b491-11e3-9f9d-c716fab88bd6)]

70
dom/system/gonk/ril_worker.js
View File

@ -1300,6 +1300,13 @@ RilObject.prototype = {
this.context.Buf.simpleRequest(REQUEST_GET_PREFERRED_NETWORK_TYPE, options);
},
/**
* Request neighboring cell ids in GSM network.
*/
getNeighboringCellIds: function(options) {
this.context.Buf.simpleRequest(REQUEST_GET_NEIGHBORING_CELL_IDS, options);
},
/**
* Request various states about the network.
*/
@ -6381,7 +6388,68 @@ RilObject.prototype[REQUEST_GET_PREFERRED_NETWORK_TYPE] = function REQUEST_GET_P
options.type = RIL_PREFERRED_NETWORK_TYPE_TO_GECKO[networkType];
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_GET_NEIGHBORING_CELL_IDS] = null;
RilObject.prototype[REQUEST_GET_NEIGHBORING_CELL_IDS] = function REQUEST_GET_NEIGHBORING_CELL_IDS(length, options) {
if (options.rilRequestError) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
this.sendChromeMessage(options);
return;
}
let radioTech = this.voiceRegistrationState.radioTech;
if (radioTech == undefined || radioTech == NETWORK_CREG_TECH_UNKNOWN) {
options.errorMsg = "RadioTechUnavailable";
this.sendChromeMessage(options);
return;
}
if (!this._isGsmTechGroup(radioTech) || radioTech == NETWORK_CREG_TECH_LTE) {
options.errorMsg = "UnsupportedRadioTech";
this.sendChromeMessage(options);
return;
}
let Buf = this.context.Buf;
let neighboringCellIds = [];
let num = Buf.readInt32();
for (let i = 0; i < num; i++) {
let cellId = {};
cellId.networkType = GECKO_RADIO_TECH[radioTech];
cellId.signalStrength = Buf.readInt32();
let cid = Buf.readString();
// pad cid string with leading "0"
let length = cid.length;
if (length > 8) {
continue;
}
if (length < 8) {
for (let j = 0; j < (8-length); j++) {
cid = "0" + cid;
}
}
switch (radioTech) {
case NETWORK_CREG_TECH_GPRS:
case NETWORK_CREG_TECH_EDGE:
case NETWORK_CREG_TECH_GSM:
cellId.gsmCellId = this.parseInt(cid.substring(4), -1, 16);
cellId.gsmLocationAreaCode = this.parseInt(cid.substring(0, 4), -1, 16);
break;
case NETWORK_CREG_TECH_UMTS:
case NETWORK_CREG_TECH_HSDPA:
case NETWORK_CREG_TECH_HSUPA:
case NETWORK_CREG_TECH_HSPA:
case NETWORK_CREG_TECH_HSPAP:
cellId.wcdmaPsc = this.parseInt(cid, -1, 16);
break;
}
neighboringCellIds.push(cellId);
}
options.result = neighboringCellIds;
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_SET_LOCATION_UPDATES] = null;
RilObject.prototype[REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE] = null;
RilObject.prototype[REQUEST_CDMA_SET_ROAMING_PREFERENCE] = function REQUEST_CDMA_SET_ROAMING_PREFERENCE(length, options) {

1
dom/system/gonk/tests/marionette/manifest.ini
View File

@ -12,3 +12,4 @@ disabled = Bug 808783
[test_data_connection.js]
[test_network_active_changed.js]
[test_multiple_data_connection.js]
[test_neighboring_cell_ids.js]

33
dom/system/gonk/tests/marionette/test_neighboring_cell_ids.js Normal file
View File

@ -0,0 +1,33 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
MARIONETTE_TIMEOUT = 30000;
MARIONETTE_HEAD_JS = "head.js";
function testGetNeighboringCellIds() {
log("Test getting neighboring cell ids");
let deferred = Promise.defer();
radioInterface.getNeighboringCellIds({
notifyGetNeighboringCellIds: function(aResult) {
deferred.resolve(aResult);
},
notifyGetNeighboringCellIdsFailed: function(aError) {
deferred.reject(aError);
}
});
return deferred.promise;
}
// Start tests
startTestBase(function() {
// TODO: Bug 1028837 - B2G Emulator: support neighboring cell ids.
// Currently, emulator does not support RIL_REQUEST_NEIGHBORING_CELL_IDS,
// so we expect to get a 'RequestNotSupported' error here.
return testGetNeighboringCellIds()
.then(function resolve(aResult) {
ok(false, "getNeighboringCellIds should not success");
}, function reject(aError) {
is(aError, "RequestNotSupported", "failed to getNeighboringCellIds");
});
});

10
dom/telephony/gonk/TelephonyService.js
View File

@ -439,10 +439,10 @@ TelephonyService.prototype = {
return;
}
function onCdmaDialSuccess() {
function onCdmaDialSuccess(aCallIndex) {
let indexes = Object.keys(this._currentCalls[aClientId]);
if (indexes.length != 1 ) {
aTelephonyCallback.notifyDialSuccess();
if (indexes.length == 0) {
aTelephonyCallback.notifyDialSuccess(aCallIndex);
return;
}
@ -458,7 +458,7 @@ TelephonyService.prototype = {
isMergeable: true,
parentId: indexes[0]
};
aTelephonyCallback.notifyDialSuccess();
aTelephonyCallback.notifyDialSuccess(CDMA_SECOND_CALL_INDEX);
// Manual update call state according to the request response.
this.notifyCallStateChanged(aClientId, childCall);
@ -486,7 +486,7 @@ TelephonyService.prototype = {
}
if (response.isCdma) {
onCdmaDialSuccess.call(this);
onCdmaDialSuccess.call(this, response.callIndex);
} else {
aTelephonyCallback.notifyDialSuccess(response.callIndex);
}

8
netwerk/base/public/nsIStreamingProtocolController.idl
View File

@ -115,7 +115,7 @@ interface nsIStreamingProtocolListener : nsISupports
/**
* Media stream controller API: control and retrieve meta data from media stream.
*/
[uuid(a9bdd4b0-8559-11e2-9e96-0800200c9a66)]
[uuid(4ce040f0-c50d-461f-94e2-af5a77fe13a5)]
interface nsIStreamingProtocolController : nsISupports
{
/**
@ -173,6 +173,12 @@ interface nsIStreamingProtocolController : nsISupports
*/
void stop();
/*
* Notify the streaming controller that the playback has ended.
* The controller might have to perform certain internal state transition.
*/
void playbackEnded();
/**
* Total number of audio/video tracks.
*/

1
netwerk/ipc/PRtspController.ipdl
View File

@ -44,6 +44,7 @@ parent:
Suspend();
Seek(uint64_t offset);
Stop();
PlaybackEnded();
__delete__();
child:

13
netwerk/protocol/rtsp/controller/RtspController.cpp
View File

@ -369,5 +369,18 @@ RtspController::Init(nsIURI *aURI)
return NS_OK;
}
NS_IMETHODIMP
RtspController::PlaybackEnded()
{
LOG(("RtspController::PlaybackEnded()"));
if (!mRtspSource.get()) {
MOZ_ASSERT(mRtspSource.get(), "mRtspSource should not be null!");
return NS_ERROR_NOT_INITIALIZED;
}
mRtspSource->playbackEnded();
return NS_OK;
}
} // namespace mozilla::net
} // namespace mozilla

23
netwerk/protocol/rtsp/controller/RtspControllerChild.cpp
View File

@ -237,7 +237,8 @@ enum IPCEvent
SendSeekEvent,
SendResumeEvent,
SendSuspendEvent,
SendStopEvent
SendStopEvent,
SendPlaybackEndedEvent
};
class SendIPCEvent : public nsRunnable
@ -281,6 +282,8 @@ public:
rv = mController->SendSuspend();
} else if (mEvent == SendStopEvent) {
rv = mController->SendStop();
} else if (mEvent == SendPlaybackEndedEvent) {
rv = mController->SendPlaybackEnded();
} else {
LOG(("RtspControllerChild::SendIPCEvent"));
}
@ -424,6 +427,24 @@ RtspControllerChild::GetTotalTracks(uint8_t *aTracks)
return NS_OK;
}
NS_IMETHODIMP
RtspControllerChild::PlaybackEnded()
{
LOG(("RtspControllerChild::PlaybackEnded"));
if (NS_IsMainThread()) {
if (!OKToSendIPC() || !SendPlaybackEnded()) {
return NS_ERROR_FAILURE;
}
} else {
nsresult rv = NS_DispatchToMainThread(
new SendIPCEvent(this, SendPlaybackEndedEvent));
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_OK;
}
//-----------------------------------------------------------------------------
// RtspControllerChild::nsIStreamingProtocolListener
//-----------------------------------------------------------------------------

11
netwerk/protocol/rtsp/controller/RtspControllerParent.cpp
View File

@ -167,6 +167,17 @@ RtspControllerParent::RecvStop()
return true;
}
bool
RtspControllerParent::RecvPlaybackEnded()
{
LOG(("RtspControllerParent::RecvPlaybackEnded()"));
NS_ENSURE_TRUE(mController, true);
nsresult rv = mController->PlaybackEnded();
SEND_DISCONNECT_IF_ERROR(rv)
return true;
}
NS_IMETHODIMP
RtspControllerParent::OnMediaDataAvailable(uint8_t index,
const nsACString & data,

1
netwerk/protocol/rtsp/controller/RtspControllerParent.h
View File

@ -37,6 +37,7 @@ class RtspControllerParent : public PRtspControllerParent
bool RecvSuspend();
bool RecvSeek(const uint64_t& offset);
bool RecvStop();
bool RecvPlaybackEnded();
private:
bool mIPCOpen;

20
netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
View File

@ -132,6 +132,13 @@ void RTSPSource::seek(uint64_t timeUs)
seekTo(timeUs);
}
void RTSPSource::playbackEnded()
{
LOGI("RTSPSource::playbackEnded()");
sp<AMessage> msg = new AMessage(kWhatPerformPlaybackEnded, mReflector->id());
msg->post();
}
status_t RTSPSource::feedMoreTSData() {
return mFinalResult;
}
@ -246,6 +253,15 @@ void RTSPSource::performSuspend() {
// TODO, Bug 895753.
}
void RTSPSource::performPlaybackEnded() {
// Transition from PLAYING to CONNECTED state so that we are ready to
// perform an another play operation.
if (mState != PLAYING) {
return;
}
mState = CONNECTED;
}
void RTSPSource::performSeek(int64_t seekTimeUs) {
if (mState != CONNECTED && mState != PLAYING && mState != PAUSING) {
return;
@ -310,6 +326,9 @@ void RTSPSource::onMessageReceived(const sp<AMessage> &msg) {
} else if (msg->what() == kWhatPerformSuspend) {
performSuspend();
return;
} else if (msg->what() == kWhatPerformPlaybackEnded) {
performPlaybackEnded();
return;
}
CHECK_EQ(msg->what(), (uint32_t)kWhatNotify);
@ -675,7 +694,6 @@ void RTSPSource::onTrackDataAvailable(size_t trackIndex)
void RTSPSource::onTrackEndOfStream(size_t trackIndex)
{
mState = CONNECTED;
if (!mListener) {
return;
}

18
netwerk/protocol/rtsp/rtsp/RTSPSource.h
View File

@ -54,6 +54,7 @@ public:
void seek(uint64_t timeUs);
void resume();
void suspend();
void playbackEnded();
status_t feedMoreTSData();
@ -71,13 +72,14 @@ protected:
private:
enum {
kWhatNotify = 'noti',
kWhatDisconnect = 'disc',
kWhatPerformSeek = 'seek',
kWhatPerformPlay = 'play',
kWhatPerformPause = 'paus',
kWhatPerformResume = 'resu',
kWhatPerformSuspend = 'susp',
kWhatNotify = 'noti',
kWhatDisconnect = 'disc',
kWhatPerformSeek = 'seek',
kWhatPerformPlay = 'play',
kWhatPerformPause = 'paus',
kWhatPerformResume = 'resu',
kWhatPerformSuspend = 'susp',
kWhatPerformPlaybackEnded = 'ende',
};
enum State {
@ -140,6 +142,8 @@ private:
void performSuspend();
void performPlaybackEnded();
void onTrackDataAvailable(size_t trackIndex);
void onTrackEndOfStream(size_t trackIndex);