[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enables a configurable SocketFactory for the RTSP client #9606

Merged
merged 21 commits into from
Dec 6, 2021
Merged

Enables a configurable SocketFactory for the RTSP client #9606

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bf09aec
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
ened Aug 28, 2017
2ac19aa
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
ened May 10, 2018
0bd3501
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
ened May 18, 2018
e34234b
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
ened Aug 23, 2018
ebb0270
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
ened Aug 29, 2018
6f9102c
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
Aug 14, 2019
1f9241a
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
Oct 22, 2021
8e24d29
Make the RTSP SocketFactory configurable
Oct 25, 2021
c14a9c0
docs
Oct 25, 2021
4001592
Add a test
Oct 26, 2021
6dd2177
Add release notes
Oct 26, 2021
1ecbdb8
formatting
Oct 26, 2021
0830c06
PR feedback
Nov 2, 2021
b7b4903
some RTSP docs
Nov 2, 2021
4c0008a
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
Nov 5, 2021
d89e18f
Merge branch 'dev-v2' into rtsp-socket-factory
Nov 5, 2021
ab397e4
move release notes entry
Nov 5, 2021
c09fa75
PR feedback
Nov 10, 2021
86447cb
Merge branch 'dev-v2' into rtsp-socket-factory
claincly Nov 11, 2021
cdcf573
Merge branch 'dev-v2' into rtsp-socket-factory
claincly Nov 15, 2021
e158f9a
Merge branch 'dev-v2' into rtsp-socket-factory
claincly Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
Sebastian Roth committed Nov 10, 2021
commit c09fa7560d5c7158fa51f0254d47d1f2a536af2b
2 changes: 1 addition & 1 deletion library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ interface Listener {
* @param uri The RTSP playback {@link Uri}.
* @param listener A {@link Listener} to receive session information updates.
* @param userAgent The user agent.
* @param debugLoggingEnabled Whether to log RTSP messages.
* @param socketFactory A socket factory for {@link RtspClient}'s connection.
ened marked this conversation as resolved.
Show resolved Hide resolved
* @param debugLoggingEnabled Whether to log RTSP messages.
*/
public RtspMediaPeriod(
Allocator allocator,
Expand Down
2 changes: 1 addition & 1 deletion library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public void onSessionTimelineRequestFailed(
EMPTY_PLAYBACK_LISTENER,
/* userAgent= */ "ExoPlayer:RtspClientTest",
RtspTestUtils.getTestUri(rtspServer.startAndGetPortNumber()),
/* socketFactory */ null,
/* socketFactory */ SocketFactory.getDefault(),
/* debugLoggingEnabled= */ false);
rtspClient.start();
RobolectricUtil.runMainLooperUntil(() -> tracksInSession.get() != null);
Expand Down