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.

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

Zoom in and zoom out in camera #176

Open
wants to merge 67 commits into
base: mediacodec
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
e46c57e
Better support of the MediaCodec API, but still disabled by default. …
Nov 2, 2013
19b0271
Mavenize library for easy inclusion in other projects
Jan 8, 2014
187ce18
Merge pull request #16 from soundmonster/master
Jan 8, 2014
279e6ac
Merge branch 'mediacodec'
Feb 8, 2014
dd0ddbd
libstreaming requires android 4.0
Feb 8, 2014
84ea97f
Git forgot some stuff during the merge.
Feb 8, 2014
5e42220
Small bug fix
Feb 9, 2014
bbf73d6
Cleaner logs and important fix in EncoderDebugger
Feb 10, 2014
819a8ef
Cleaner logs and important fix in EncoderDebugger
Feb 10, 2014
4f4cd4d
Updated README
Feb 10, 2014
47de3fc
Fixed some typos.
Feb 10, 2014
f3efff3
Fixed some typos.
Feb 10, 2014
14faa7a
Fixed some typos.
Feb 10, 2014
8f749e7
Fixed some typos.
Feb 10, 2014
64ccdf5
Fixed some typos.
Feb 10, 2014
b7e1ae7
Fix that prevent two Session instances to open the camera at the same…
Feb 10, 2014
b562457
Fixed some typos.
Feb 11, 2014
2359e79
A fix for some phone that have a buggy MediaCodecList API.
Feb 14, 2014
5b7e1c7
A fix for some phone that have a buggy MediaCodecList API.
Feb 15, 2014
ada92e2
I readded the \r\n in the RtspClient, remove it if you need. Sps and …
Feb 19, 2014
8c45c58
Bug in the RtspServer finally solved ! Fixed a bug in the MP4Parser a…
Feb 22, 2014
7b59c68
Started the implementation of TCP support. Not ready yet.
Mar 28, 2014
9530973
New feature: the aspect ratio of the gl.SurfaceView can now easily ma…
Mar 29, 2014
6a97798
Updated the javadoc.
Mar 29, 2014
0472180
Some bug fixes, some unecessary calls to the Camera API are now avoided.
Apr 24, 2014
e1758aa
New handler created for each session instance. Otherwise, it gives a …
brunosiqueira May 19, 2014
6893171
Merge pull request #35 from igarape/master
May 28, 2014
f95f91b
FOund a cleaner way to solve the dead thread issue.
May 28, 2014
2e62cbc
fix "ERROR: resource directory 'libstreaming/res' does not exist"
pnemonic78 Jun 2, 2014
b369ce8
5 bits for the object type / 4 bits for the sampling rate / 4 bits for
Jun 2, 2014
2758df6
spelling.
Jun 2, 2014
9c5df6c
Cleaner error message when the Callback buffer was to small error occ…
Jun 13, 2014
b931f21
Merge branch 'master' of https://github.com/pnemonic78/libstreaming i…
Jun 13, 2014
0752b10
Merge branch 'pnemonic78-master'
Jun 13, 2014
41b1818
Fixed typo
Jun 13, 2014
d8a6498
Updated javadoc.
Jun 13, 2014
4315bc1
Fix a bug preventing the size of the PPS from being written into STAP…
Aug 12, 2014
e41aa61
Merge pull request #58 from sigmabeta/stapa-fix
Apr 19, 2015
2343e3a
Lollipop support attempt
May 28, 2015
39ead53
Updated Javadoc
Jun 1, 2015
38abef3
Update README.md
Jun 1, 2015
628e730
Update README.md
Jun 1, 2015
c3b707a
Two fixes in the RTSP client (RtspClient.java) proposed by Magnus Joh…
Aug 9, 2015
aff4392
Merge branch 'master' of https://github.com/fyhertz/libstreaming
Aug 9, 2015
b2ad11f
Add basic Authorization
Aug 28, 2015
b8c9134
Deal with null username and password
Aug 28, 2015
ac44416
Merge pull request #129 from grunk/master
Aug 28, 2015
587b516
Removed org.apache.http.* imports
serpro Sep 9, 2015
94189f4
Merge pull request #132 from serpro/patch-1
Oct 3, 2015
2d9a17f
Fixing squid:S2293 - The diamond operator ("<>") should be used.
the-best-dev Mar 17, 2016
8312cf7
Fixing squid:S1066 - Collapsible "if" statements should be merged.
the-best-dev Mar 17, 2016
b050628
Fixing squid:S2178 - Short-circuit logic should be used in boolean co…
the-best-dev Mar 17, 2016
68b19dd
Fixing squid:S2259- Null pointers should not be dereferenced.
the-best-dev Mar 17, 2016
fefcf29
Fixing squid:S1155, squid:S1126
the-best-dev Mar 17, 2016
38ecb1d
fixing `NullPointerException` when no query in URI string (e.g. rtsp:…
Apr 26, 2016
197b569
Merge pull request #187 from DevFactory/release/collapsable-if-statem…
Mar 13, 2017
3a7a52f
Merge pull request #189 from DevFactory/release/general-code-quality-…
Mar 13, 2017
af5a95b
Merge pull request #184 from DevFactory/release/short-circuit-logic-s…
Mar 13, 2017
bd30223
Merge pull request #186 from DevFactory/release/null-pointers-should-…
Mar 13, 2017
f620117
Merge pull request #205 from apavlenko/fix/null-pointer-uri-parse
Mar 13, 2017
71558f6
libstreaming is now licensed under the Apache license version 2.0
Mar 13, 2017
fe23825
libstreaming is now licensed under the Apache license version 2.0
Mar 13, 2017
ba6dc86
Updated readme.
Mar 12, 2018
89e0382
Updated readme.
Mar 12, 2018
e71b49c
Merge pull request #185 from DevFactory/release/diamond-operator-shou…
Apr 10, 2018
0c2078d
The 'client_port' parameter's range specification (i.e RTCP port part…
KentVu Apr 17, 2018
3a78d22
Merge pull request #276 from KentVu/pr_prepare
Feb 8, 2019
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
Small bug fix
fyhertz committed Feb 9, 2014
commit 5e42220b387aa326526c1a904dc225cf44215e75
4 changes: 2 additions & 2 deletions src/net/majorkernelpanic/streaming/video/VideoQuality.java
Original file line number Diff line number Diff line change
@@ -130,8 +130,8 @@ public static int[] determineMaximumSupportedFramerate(Camera.Parameters paramet
List<int[]> supportedFpsRanges = parameters.getSupportedPreviewFpsRange();
for (Iterator<int[]> it = supportedFpsRanges.iterator(); it.hasNext();) {
int[] interval = it.next();
supportedFpsRangesStr += interval[0]+"-"+interval[1]+"fps"+(it.hasNext()?", ":"");
if (interval[1]/1000>maxFps[1]) {
supportedFpsRangesStr += interval[0]/1000+"-"+interval[1]/1000+"fps"+(it.hasNext()?", ":"");
if (interval[1]>maxFps[1] || (interval[0]>maxFps[0] && interval[1]==maxFps[1])) {
maxFps = interval;
}
}