[vlc-commits] test.html: add demo for getting current item index
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:53 2015 +0200| [ea030598afc56cfee2ac4bc8ea48ba78857d7b5e] | committer: Jean-Baptiste Kempf test.html: add demo for getting current item index Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=ea030598afc56cfee2ac4bc8ea48ba78857d7b5e --- share/test/test.html |2 ++ 1 file changed, 2 insertions(+) diff --git a/share/test/test.html b/share/test/test.html index bb4659b..ce5e594 100644 --- a/share/test/test.html +++ b/share/test/test.html @@ -380,6 +380,8 @@ function close() + + ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test.html: Improve working of select tags
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:39 2015 +0200| [bf9a9d87edde0b9f065c03a32d7834c2835f35ce] | committer: Jean-Baptiste Kempf test.html: Improve working of select tags Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=bf9a9d87edde0b9f065c03a32d7834c2835f35ce --- share/test/test.html |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/test/test.html b/share/test/test.html index e474d6d..7579a18 100644 --- a/share/test/test.html +++ b/share/test/test.html @@ -331,7 +331,7 @@ function close() Audio Channel: - + Stereo Reverse Stereo Left @@ -377,7 +377,7 @@ function close() - + Color Opacity Position @@ -388,6 +388,7 @@ function close() X Y + @@ -395,7 +396,7 @@ function close() - + File Position Opacity @@ -404,6 +405,7 @@ function close() X Y + ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test.html: add a html seekbar
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:52 2015 +0200| [03884873634814efb34563ad34c8052d01e05d36] | committer: Jean-Baptiste Kempf test.html: add a html seekbar Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=03884873634814efb34563ad34c8052d01e05d36 --- share/test/test.html | 73 +- 1 file changed, 66 insertions(+), 7 deletions(-) diff --git a/share/test/test.html b/share/test/test.html index 82b8ee1..bb4659b 100644 --- a/share/test/test.html +++ b/share/test/test.html @@ -4,6 +4,35 @@ VLC Plugin test page
[vlc-commits] test.html: improve demo for getting current position/time
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:50 2015 +0200| [4847caca0268c77acd5192f85ccc2c619684a9ba] | committer:
Jean-Baptiste Kempf
test.html: improve demo for getting current position/time
The existing method 'doGetPosition() has returned the time instead of the
position.
Now there are two own methods for getting time and position.
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=4847caca0268c77acd5192f85ccc2c619684a9ba
---
share/test/test.html | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/share/test/test.html b/share/test/test.html
index 639dd14..a16efb7 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -368,6 +368,7 @@ function close()
+
@@ -491,9 +492,16 @@ function doGetPosition()
{
var vlc = getVLC("vlc");
-// set slider to new position
if( vlc )
-alert( "position is " + vlc.input.time);
+alert( "position is " + vlc.input.position );
+}
+
+function doGetTime()
+{
+var vlc = getVLC("vlc");
+
+if( vlc )
+alert( "time is " + vlc.input.time );
}
function doGetRate()
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test.html: fix teletext toggling
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:51 2015 +0200| [51e70e4b195795469fcac746ce6b68c41026c46a] | committer:
Jean-Baptiste Kempf
test.html: fix teletext toggling
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=51e70e4b195795469fcac746ce6b68c41026c46a
---
share/test/test.html |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/share/test/test.html b/share/test/test.html
index a16efb7..82b8ee1 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -569,13 +569,13 @@ function doToggleTeletext()
vlc.video.toggleTeletext();
if( telxState )
{
-document.getElementById("telx").innerHTML = "Teletext on";
-telxState = true;
+document.getElementById("telx").value = "Teletext off";
+telxState = false;
}
else
{
-document.getElementById("telx").innerHTML = "Teletext off";
-telxState = false;
+document.getElementById("telx").value = "Teletext on";
+telxState = true;
}
}
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Test: fix line endings
npapi-vlc | branch: master | Jean-Baptiste Kempf | Sun Jun
14 00:56:07 2015 +0200| [9bbd5da8439df38c8cdf3d16eea252a2dd8b115f] | committer:
Jean-Baptiste Kempf
Test: fix line endings
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=9bbd5da8439df38c8cdf3d16eea252a2dd8b115f
---
share/test/resize.html | 200
1 file changed, 100 insertions(+), 100 deletions(-)
diff --git a/share/test/resize.html b/share/test/resize.html
index 7e8ed07..7b1cb23 100644
--- a/share/test/resize.html
+++ b/share/test/resize.html
@@ -1,100 +1,100 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-
-
- VLC Resizing Test Page
- http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js";>
-
- #video_window {
- position: absolute;
- left: 50px;
- top: 50px;
- width: 533px;
- height: 300px;
- }
-
-
- var isMoving = false;
- var isResizing = false;
-
- var movingOutProperties = {
- left: "150px",
- top: "150px"
- };
- var movingBackProperties = {
- left: "50px",
- top: "50px"
- };
- var resizeOutProperties = {
- width: "1066px",
- height: "600px"
- };
- var resizeBackProperties = {
- width: "533px",
- height: "300px"
- };
-
- function ToggleMoving()
- {
- isMoving = !isMoving;
-
- if(isMoving)
- MoveOut();
- }
-
- function MoveOut()
- {
- if(!isMoving)
- return;
-
- $("#video_window").animate(movingOutProperties,
1000, "swing", MoveBack);
- }
-
- function MoveBack()
- {
- if(!isMoving)
- return;
-
-
$("#video_window").animate(movingBackProperties, 1000, "swing", MoveOut);
- }
-
- function ToggleResizing()
- {
- isResizing = !isResizing;
-
- if(isResizing)
- ResizeOut();
- }
-
- function ResizeOut()
- {
- if(!isResizing)
- return;
-
- $("#video_window").animate(resizeOutProperties,
1000, "swing", ResizeBack);
- }
-
- function ResizeBack()
- {
- if(!isResizing)
- return;
-
-
$("#video_window").animate(resizeBackProperties, 1000, "swing", ResizeOut);
- }
-
-
-
-
-
-
- http://streams.videolan.org/streams/mp4/h264-sample-thefluff.mp4";
- toolbar="false"
- id="vlc_control"
- >
-
-
-
-
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+
+ VLC Resizing Test Page
+ http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js";>
+
+ #video_window {
+ position: absolute;
+ left: 50px;
+ top: 50px;
+ width: 533px;
+ height: 300px;
+ }
+
+
+ var isMoving = false;
+ var isResizing = false;
+
+ var movingOutProperties = {
+ left: "150px",
+ top: "150px"
+ };
+ var movingBackProperties = {
+ left: "50px",
+ top: "50px"
+
[vlc-commits] test pages: JavaScript indenting, cleanup and improving
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:42 2015 +0200| [0b534e9a779384a4739c8bee9ecb98d282fc5ec4] | committer: Jean-Baptiste Kempf test pages: JavaScript indenting, cleanup and improving Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=0b534e9a779384a4739c8bee9ecb98d282fc5ec4 --- share/test/simple.html | 17 +- share/test/test.html | 272 +++ share/test/windowless.html | 383 ++-- 3 files changed, 193 insertions(+), 479 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commitdiff;h=0b534e9a779384a4739c8bee9ecb98d282fc5ec4 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test.html: check validity of text field values
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:47 2015 +0200| [3f3a17578d6f789b6092bfcd3040995592703189] | committer:
Jean-Baptiste Kempf
test.html: check validity of text field values
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=3f3a17578d6f789b6092bfcd3040995592703189
---
share/test/test.html | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/share/test/test.html b/share/test/test.html
index b53666d..6aee558 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -514,7 +514,11 @@ function doAudioTrack(value)
var vlc = getVLC("vlc");
if( vlc )
{
-vlc.audio.track = vlc.audio.track + value;
+var newValue = vlc.audio.track + value;
+if( newValue >= 0 && newValue < vlc.audio.count )
+{
+vlc.audio.track = newValue;
+}
document.getElementById("trackTextField").innerHTML = vlc.audio.track;
}
}
@@ -531,7 +535,11 @@ function doSubtitle(value)
var vlc = getVLC("vlc");
if( vlc )
{
-vlc.subtitle.track = vlc.subtitle.track + value;
+var newValue = vlc.subtitle.track + value;
+if( newValue >= 0 && newValue < vlc.subtitle.count )
+{
+vlc.subtitle.track = vlc.subtitle.track + value;
+}
document.getElementById("spuTextField").innerHTML = vlc.subtitle.track;
}
}
@@ -577,7 +585,14 @@ function doRemoveItem(item)
{
var vlc = getVLC("vlc");
if( vlc )
-vlc.playlist.items.remove(item);
+{
+var count = vlc.playlist.items.count;
+if( !isNaN(item) && item !== "" && item >= 0 && item < count )
+{
+vlc.playlist.items.remove(item);
+doItemCount();
+}
+}
}
function doPlaylistClearAll()
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test pages: HTML indenting, cleanup and cosmetics
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:38 2015 +0200| [014dfb8a5991776137abe9731c3b1886e5614abd] | committer: Jean-Baptiste Kempf test pages: HTML indenting, cleanup and cosmetics Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=014dfb8a5991776137abe9731c3b1886e5614abd --- share/test/simple.html | 14 +- share/test/test.html | 372 +++- share/test/windowless.html | 144 + 3 files changed, 275 insertions(+), 255 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commitdiff;h=014dfb8a5991776137abe9731c3b1886e5614abd ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test pages: update state if playback is ended
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:46 2015 +0200| [f444762f957022be2cc77323b3e2affc8aebf325] | committer:
Jean-Baptiste Kempf
test pages: update state if playback is ended
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=f444762f957022be2cc77323b3e2affc8aebf325
---
share/test/test.html |2 ++
share/test/windowless.html |2 ++
2 files changed, 4 insertions(+)
diff --git a/share/test/test.html b/share/test/test.html
index 6154ca9..b53666d 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -831,7 +831,9 @@ function onPlay()
function onEnd()
{
+document.getElementById("info").innerHTML = "-:--:--/-:--:--";
document.getElementById("state").innerHTML = "End...";
+document.getElementById("PlayOrPause").value = "Play";
setSeekable(false);
}
diff --git a/share/test/windowless.html b/share/test/windowless.html
index 0598024..bb9da9e 100644
--- a/share/test/windowless.html
+++ b/share/test/windowless.html
@@ -459,7 +459,9 @@ function onPlay()
function onEnd()
{
+document.getElementById("info").innerHTML = "-:--:--/-:--:--";
document.getElementById("state").innerHTML = "End...";
+document.getElementById("PlayOrPause").value = "Play";
}
var liveFeedText = ["Live", "((Live))", "(( Live ))", "(( Live
))"];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test.html: rearrange some buttons
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:49 2015 +0200| [a1846702d337eea16dfa6bc30137065fb05914cd] | committer: Jean-Baptiste Kempf test.html: rearrange some buttons Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=a1846702d337eea16dfa6bc30137065fb05914cd --- share/test/test.html | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/share/test/test.html b/share/test/test.html index f9716d6..639dd14 100644 --- a/share/test/test.html +++ b/share/test/test.html @@ -336,6 +336,14 @@ function close() + + + + + + + + Aspect Ratio: Default @@ -346,13 +354,6 @@ function close() 5:4 - - - - - - - Audio Channel: @@ -363,10 +364,11 @@ function close() Right Dolby - - + + + Audio Track: @@ -376,9 +378,8 @@ function close() - + - ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test.html: Add missing deinterlace modes
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:41 2015 +0200| [a96a6ca26aa52fda28a0bfc112ee695fff43a8f3] | committer: Jean-Baptiste Kempf test.html: Add missing deinterlace modes Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=a96a6ca26aa52fda28a0bfc112ee695fff43a8f3 --- share/test/test.html | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/share/test/test.html b/share/test/test.html index 156f7ef..e032a3e 100644 --- a/share/test/test.html +++ b/share/test/test.html @@ -373,8 +373,17 @@ function close() Deinterlacing: - - + +Blend +Bob +Discard +Linear +Mean +X +Yadif +Yadif2x + + ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test pages: fix live media animation
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:44 2015 +0200| [a1f445c369834df1da742edf3693fd684927f8c1] | committer:
Jean-Baptiste Kempf
test pages: fix live media animation
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=a1f445c369834df1da742edf3693fd684927f8c1
---
share/test/test.html | 17 ++---
share/test/windowless.html | 10 +-
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/share/test/test.html b/share/test/test.html
index 56af9b5..920d93d 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -168,6 +168,12 @@ function handle_MediaPlayerTimeChanged(time)
// seekable media
info.innerHTML = formatTime(time)+"/"+formatTime(mediaLen);
}
+else
+{
+// non-seekable "live" media
+liveFeedRoll = liveFeedRoll & 3;
+info.innerHTML = liveFeedText[liveFeedRoll++];
+}
}
}
@@ -456,8 +462,8 @@ function close()
[vlc-commits] test.html: remove reverse mode, display current rate instead
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:48 2015 +0200| [62a7c5216643aa13ced238f0f32acf336554132f] | committer:
Jean-Baptiste Kempf
test.html: remove reverse mode, display current rate instead
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=62a7c5216643aa13ced238f0f32acf336554132f
---
share/test/test.html | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/share/test/test.html b/share/test/test.html
index 6aee558..f9716d6 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -316,7 +316,7 @@ function close()
-
+1x
@@ -495,11 +495,11 @@ function doGetPosition()
alert( "position is " + vlc.input.time);
}
-function doReverse(rate)
+function doGetRate()
{
var vlc = getVLC("vlc");
if( vlc )
-vlc.input.rate = -1.0 * vlc.input.rate;
+document.getElementById("rateTextField").innerHTML = vlc.input.rate +
"x";
}
function doAudioChannel(value)
@@ -740,14 +740,20 @@ function doPlaySlower()
{
var vlc = getVLC("vlc");
if( vlc )
+{
vlc.input.rate = vlc.input.rate / 2;
+doGetRate();
+}
}
function doPlayFaster()
{
var vlc = getVLC("vlc");
if( vlc )
+{
vlc.input.rate = vlc.input.rate * 2;
+doGetRate();
+}
}
function doMarqueeOption(option, value)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test pages: Submit values if return key is pressed in a text field
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:40 2015 +0200| [df48864bf92ec5726f30277ff7e9675bdab385c4] | committer:
Jean-Baptiste Kempf
test pages: Submit values if return key is pressed in a text field
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=df48864bf92ec5726f30277ff7e9675bdab385c4
---
share/test/test.html | 77 ++--
share/test/windowless.html | 12 +--
2 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/share/test/test.html b/share/test/test.html
index 7579a18..156f7ef 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -4,7 +4,9 @@
VLC Plugin test page
-
+form {
+display:inline;
+}
[vlc-commits] test pages: fix working of play/pause button
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:45 2015 +0200| [268ed518851a6b72595a99a5fbdbc69822532003] | committer:
Jean-Baptiste Kempf
test pages: fix working of play/pause button
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=268ed518851a6b72595a99a5fbdbc69822532003
---
share/test/test.html |3 +++
share/test/windowless.html |4
2 files changed, 7 insertions(+)
diff --git a/share/test/test.html b/share/test/test.html
index 920d93d..6154ca9 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -707,7 +707,10 @@ function doPlayOrPause()
var vlc = getVLC("vlc");
if( vlc )
{
+if( vlc.playlist.isPlaying )
vlc.playlist.togglePause();
+else
+vlc.playlist.play();
}
}
diff --git a/share/test/windowless.html b/share/test/windowless.html
index c464cda..0598024 100644
--- a/share/test/windowless.html
+++ b/share/test/windowless.html
@@ -419,7 +419,11 @@ function doPlayOrPause()
var vlc = getVLC("vlc");
if( vlc )
{
+if( vlc.playlist.isPlaying )
vlc.playlist.togglePause();
+else
+vlc.playlist.play();
+}
}
function doStop()
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test pages: show current state after buffering
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14
00:35:43 2015 +0200| [f5913acb7ac27bba7884033ecc50962482da] | committer:
Jean-Baptiste Kempf
test pages: show current state after buffering
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=f5913acb7ac27bba7884033ecc50962482da
---
share/test/test.html | 11 +++
share/test/windowless.html | 11 +++
2 files changed, 22 insertions(+)
diff --git a/share/test/test.html b/share/test/test.html
index 116fe22..56af9b5 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -107,7 +107,18 @@ function handle_MediaPlayerOpening()
function handle_MediaPlayerBuffering(val)
{
+var vlc = getVLC("vlc");
+
document.getElementById("info").innerHTML = val + "%";
+
+if( vlc && val == 100 )
+{
+// display the current state after buffering
+if( vlc.playlist.isPlaying )
+onPlay();
+else
+onPause();
+}
}
function handle_MediaPlayerPlaying()
diff --git a/share/test/windowless.html b/share/test/windowless.html
index 32d69da..ea5dd2f 100644
--- a/share/test/windowless.html
+++ b/share/test/windowless.html
@@ -111,7 +111,18 @@ function handle_MediaPlayerOpening()
function handle_MediaPlayerBuffering(val)
{
+var vlc = getVLC("vlc");
+
document.getElementById("info").innerHTML = val + "%";
+
+if( vlc && val == 100 )
+{
+// display the current state after buffering
+if( vlc.playlist.isPlaying )
+onPlay();
+else
+onPause();
+}
}
function handle_MediaPlayerPlaying()
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] test pages: Use HTML5 standards and fix invalid HTML
npapi-vlc | branch: master | Daniel Amm | Sun Jun 14 00:35:37 2015 +0200| [6b1ac74d3ff3f4b6b2cd46e7d33194b20d5c1bd5] | committer: Jean-Baptiste Kempf test pages: Use HTML5 standards and fix invalid HTML Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=6b1ac74d3ff3f4b6b2cd46e7d33194b20d5c1bd5 --- share/test/resize.html | 13 + share/test/simple.html | 11 ++- share/test/test.html | 36 +--- share/test/windowless.html | 24 +++- 4 files changed, 39 insertions(+), 45 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commitdiff;h=6b1ac74d3ff3f4b6b2cd46e7d33194b20d5c1bd5 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins2: fix compilation on Linux (if no libtar)
vlc/vlc-2.2 | branch: master | Erwan Tulou | Sun Jun 14
00:38:28 2015 +0200| [b9b974d7a924f59ccca3decbd1a4e5d38345ffe9] | committer:
Erwan Tulou
skins2: fix compilation on Linux (if no libtar)
problem reported by Timothy B. Terriberry"
(cherry picked from commit 7a8a62f6f7987d01232800924b75ab4d05fc163e)
Signed-off-by: Erwan Tulou
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b9b974d7a924f59ccca3decbd1a4e5d38345ffe9
---
modules/gui/skins2/src/theme_loader.cpp |3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/gui/skins2/src/theme_loader.cpp
b/modules/gui/skins2/src/theme_loader.cpp
index e54f999..6766be5 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -64,6 +64,9 @@ int makedir( const char *newdir );
#define WINAMP2_XML_FILE "winamp2.xml"
#define ZIP_BUFFER_SIZE 4096
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
bool ThemeLoader::load( const string &fileName )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins2: fix compilation on Linux (if no libtar)
vlc | branch: master | Erwan Tulou | Sun Jun 14 00:38:28
2015 +0200| [7a8a62f6f7987d01232800924b75ab4d05fc163e] | committer: Erwan Tulou
skins2: fix compilation on Linux (if no libtar)
problem reported by Timothy B. Terriberry"
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7a8a62f6f7987d01232800924b75ab4d05fc163e
---
modules/gui/skins2/src/theme_loader.cpp |3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/gui/skins2/src/theme_loader.cpp
b/modules/gui/skins2/src/theme_loader.cpp
index e54f999..6766be5 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -64,6 +64,9 @@ int makedir( const char *newdir );
#define WINAMP2_XML_FILE "winamp2.xml"
#define ZIP_BUFFER_SIZE 4096
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
bool ThemeLoader::load( const string &fileName )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vdpau: fix VdpDecoderCreate error handling (fix #14878)
vlc | branch: master | Rémi Denis-Courmont | Sat Jun 13
23:08:37 2015 +0300| [647306cead8bda2ab5e3cb5bf8552e7068484b11] | committer:
Rémi Denis-Courmont
vdpau: fix VdpDecoderCreate error handling (fix #14878)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=647306cead8bda2ab5e3cb5bf8552e7068484b11
---
modules/hw/vdpau/avcodec.c |1 +
1 file changed, 1 insertion(+)
diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index 6a3b67e..0c2a946 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -316,6 +316,7 @@ static int Open(vlc_va_t *va, AVCodecContext *avctx, enum
PixelFormat pix_fmt,
avctx->refs, &hwctx->decoder);
if (err != VDP_STATUS_OK)
{
+hwctx->decoder = VDP_INVALID_HANDLE;
msg_Err(va, "%s creation failure: %s", "decoder",
vdp_get_error_string(sys->vdp, err));
goto error;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: remove handler check at es creation time (fix #12685)
vlc | branch: master | Francois Cartegnie | Sat Jun 13
19:53:26 2015 +0200| [31344ca1fc0b7f34344dc6c0173c93e801c3805f] | committer:
Francois Cartegnie
demux: mp4: remove handler check at es creation time (fix #12685)
fmt cat is checked/mapped earlier against handler
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31344ca1fc0b7f34344dc6c0173c93e801c3805f
---
modules/demux/mp4/mp4.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 2cc8b58..6c6c3f4 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2381,7 +2381,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t
*p_track,
switch( p_track->fmt.i_cat )
{
case VIDEO_ES:
-if ( !p_sample->data.p_sample_vide || p_sample->i_handler != ATOM_vide
)
+if ( !p_sample->data.p_sample_vide )
return VLC_EGENERIC;
SetupVideoES( p_demux, p_track, p_sample );
@@ -2397,13 +2397,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t
*p_track,
break;
case AUDIO_ES:
-if ( !p_sample->data.p_sample_soun || p_sample->i_handler != ATOM_soun
)
+if ( !p_sample->data.p_sample_soun )
return VLC_EGENERIC;
SetupAudioES( p_demux, p_track, p_sample );
break;
case SPU_ES:
-if ( !p_sample->data.p_sample_text || p_sample->i_handler != ATOM_text
)
+if ( !p_sample->data.p_sample_text )
return VLC_EGENERIC;
SetupSpuES( p_demux, p_track, p_sample );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] activex: remove useless events
npapi-vlc | branch: master | Daniel Amm | Tue Jun 2
20:55:14 2015 +0200| [15ae16420132dfd248a29957ab3fa5825c6ba859] | committer:
Jean-Baptiste Kempf
activex: remove useless events
These are remnants of the old v1 activex plugin
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=15ae16420132dfd248a29957ab3fa5825c6ba859
---
activex/axvlc.idl | 14 +-
activex/plugin.cpp | 21 -
activex/plugin.h |4
3 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/activex/axvlc.idl b/activex/axvlc.idl
index 89b3564..8f3ca34 100644
--- a/activex/axvlc.idl
+++ b/activex/axvlc.idl
@@ -63,11 +63,6 @@ library AXVLC
const int DISPID_Visible= 100;
-
-const int DISPID_PlayEvent = 100;
-const int DISPID_PauseEvent = 101;
-const int DISPID_StopEvent = 102;
-
/* async events from libvlc */
const int DISPID_MediaPlayerNothingSpecialEvent = 200;
const int DISPID_MediaPlayerOpeningEvent = 201;
@@ -96,14 +91,7 @@ library AXVLC
{
properties:
methods:
-[id(DISPID_PlayEvent), helpstring("Playing")]
-void play();
-[id(DISPID_PauseEvent), helpstring("Paused")]
-void pause();
-[id(DISPID_StopEvent), helpstring("Stopped")]
-void stop();
-
-/* asyn events from libvlc */
+/* async events from libvlc */
[id(DISPID_MediaPlayerNothingSpecialEvent), helpstring("Idle
state")]
void MediaPlayerNothingSpecial();
[id(DISPID_MediaPlayerOpeningEvent), helpstring("Opening media")]
diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index 96acacc..e46edcb 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -705,10 +705,7 @@ BOOL VLCPlugin::getFullscreen()
HRESULT VLCPlugin::onInPlaceDeactivate(void)
{
if( m_player.mlp().isPlaying() )
-{
m_player.mlp().stop();
-fireOnStopEvent();
-}
_WindowsManager.DestroyWindows();
@@ -957,24 +954,6 @@ void VLCPlugin::firePropChangedEvent(DISPID dispid)
vlcConnectionPointContainer->firePropChangedEvent(dispid);
};
-void VLCPlugin::fireOnPlayEvent(void)
-{
-DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
-vlcConnectionPointContainer->fireEvent(DISPID_PlayEvent,
&dispparamsNoArgs);
-};
-
-void VLCPlugin::fireOnPauseEvent(void)
-{
-DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
-vlcConnectionPointContainer->fireEvent(DISPID_PauseEvent,
&dispparamsNoArgs);
-};
-
-void VLCPlugin::fireOnStopEvent(void)
-{
-DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
-vlcConnectionPointContainer->fireEvent(DISPID_StopEvent,
&dispparamsNoArgs);
-};
-
/*
* Async events
*/
diff --git a/activex/plugin.h b/activex/plugin.h
index 6364c34..1f2dbd6 100644
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -242,10 +242,6 @@ public:
*/
void freezeEvents(BOOL freeze);
void firePropChangedEvent(DISPID dispid);
-//FIXME: I'm fairly convinced this 3 events are useless.
-void fireOnPlayEvent(void);
-void fireOnPauseEvent(void);
-void fireOnStopEvent(void);
// async events;
void fireOnMediaPlayerNothingSpecialEvent();
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Lua.cli: improve lua 5.3 compatibility
vlc | branch: master | Jean-Baptiste Kempf | Sat Jun 13
18:15:06 2015 +0200| [ebe6e7de1bbdf7181cdbeca61b5591f9b31ac711] | committer:
Jean-Baptiste Kempf
Lua.cli: improve lua 5.3 compatibility
Close #14803
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ebe6e7de1bbdf7181cdbeca61b5591f9b31ac711
---
share/lua/intf/cli.lua |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/lua/intf/cli.lua b/share/lua/intf/cli.lua
index e2fa856..d6d3001 100644
--- a/share/lua/intf/cli.lua
+++ b/share/lua/intf/cli.lua
@@ -343,7 +343,7 @@ function help(name,client,arg)
end
if val.args then str = str .. " " .. val.args end
if #str%2 == 1 then str = str .. " " end
-str = str .. string.rep(" .",(width-(#str+#val.help)-1)/2)
+str = str .. string.rep("
.",math.floor((width-(#str+#val.help)-1)/2))
str = str .. string.rep(" ",width-#str-#val.help) .. val.help
end
client:append(str)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: libmp4: constify counters/walkers
vlc | branch: master | Francois Cartegnie | Fri Jun 12
22:44:53 2015 +0200| [30c09ef4ae454d4a8b370983123db0d512ca16cc] | committer:
Francois Cartegnie
demux: libmp4: constify counters/walkers
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=30c09ef4ae454d4a8b370983123db0d512ca16cc
---
modules/demux/mp4/libmp4.c | 22 +++---
modules/demux/mp4/libmp4.h |6 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index dc606f0..79af23d 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -4155,10 +4155,10 @@ error:
}
-static void MP4_BoxDumpStructure_Internal( stream_t *s,
-MP4_Box_t *p_box, unsigned int i_level )
+static void MP4_BoxDumpStructure_Internal( stream_t *s, const MP4_Box_t *p_box,
+ unsigned int i_level )
{
-MP4_Box_t *p_child;
+const MP4_Box_t *p_child;
uint32_t i_displayedtype = p_box->i_type;
if( ! MP4_BOX_TYPE_ASCII() ) ((char*)&i_displayedtype)[0] = 'c';
@@ -4194,7 +4194,7 @@ static void MP4_BoxDumpStructure_Internal( stream_t *s,
}
}
-void MP4_BoxDumpStructure( stream_t *s, MP4_Box_t *p_box )
+void MP4_BoxDumpStructure( stream_t *s, const MP4_Box_t *p_box )
{
MP4_BoxDumpStructure_Internal( s, p_box, 0 );
}
@@ -4250,8 +4250,8 @@ static void get_token( char **ppsz_path, char
**ppsz_token, int *pi_number )
}
}
-static void MP4_BoxGet_Internal( MP4_Box_t **pp_result,
- MP4_Box_t *p_box, const char *psz_fmt, va_list args)
+static void MP4_BoxGet_Internal( const MP4_Box_t **pp_result, const MP4_Box_t
*p_box,
+ const char *psz_fmt, va_list args)
{
char *psz_dup;
char *psz_path;
@@ -4384,16 +4384,16 @@ error_box:
* ex: /moov/trak[12]
* ../mdia
*/
-MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char *psz_fmt, ... )
+MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt, ... )
{
va_list args;
-MP4_Box_t *p_result;
+const MP4_Box_t *p_result;
va_start( args, psz_fmt );
MP4_BoxGet_Internal( &p_result, p_box, psz_fmt, args );
va_end( args );
-return( p_result );
+return( (MP4_Box_t *) p_result );
}
/*
@@ -4405,11 +4405,11 @@ MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char
*psz_fmt, ... )
* ex: /moov/trak[12]
* ../mdia
*/
-unsigned MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... )
+unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt, ... )
{
va_list args;
unsigned i_count;
-MP4_Box_t *p_result, *p_next;
+const MP4_Box_t *p_result, *p_next;
va_start( args, psz_fmt );
MP4_BoxGet_Internal( &p_result, p_box, psz_fmt, args );
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 4e56996..32d4896 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -1674,7 +1674,7 @@ void MP4_BoxFree( stream_t *, MP4_Box_t *p_box );
*
* Useful while debugging
*/
-void MP4_BoxDumpStructure( stream_t *p_input, MP4_Box_t *p_box );
+void MP4_BoxDumpStructure( stream_t *p_input, const MP4_Box_t *p_box );
/*
* MP4_BoxGet: find a box given a path relative to p_box
@@ -1685,7 +1685,7 @@ void MP4_BoxDumpStructure( stream_t *p_input, MP4_Box_t
*p_box );
* ex: /moov/trak[12]
* ../mdia
*/
-MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char *psz_fmt, ... );
+MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt, ... );
/*
* MP4_BoxCount: find number of box given a path relative to p_box
@@ -1696,7 +1696,7 @@ MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char
*psz_fmt, ... );
* ex: /moov/trak
* ../mdia
*/
-unsigned MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... );
+unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt, ... );
/* Internal functions exposed for MKV demux */
int MP4_PeekBoxHeader( stream_t *p_stream, MP4_Box_t *p_box );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: drop base duration
vlc | branch: master | Francois Cartegnie | Fri Jun 12
17:32:13 2015 +0200| [455153a8133b3b98d56b1006d4fdd3ec82d2ffc1] | committer:
Francois Cartegnie
demux: mp4: drop base duration
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=455153a8133b3b98d56b1006d4fdd3ec82d2ffc1
---
modules/demux/mp4/mp4.c |2 --
1 file changed, 2 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index aa9c1cb..89e60b1 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -74,7 +74,6 @@ struct demux_sys_t
uint64_t i_time; /* time position of the presentation
* in movie timescale */
uint32_t i_timescale;/* movie time scale */
-uint64_t i_duration; /* movie duration */
unsigned int i_tracks; /* number of tracks */
mp4_track_t *track; /* array of track */
floatf_fps; /* number of frame per seconds */
@@ -348,7 +347,6 @@ static int LoadInitFrag( demux_t *p_demux )
if ( p_stra && BOXDATA(p_stra) )
{
p_sys->i_timescale = BOXDATA(p_stra)->i_timescale;
-p_sys->i_duration = BOXDATA(p_stra)->i_duration;
p_sys->i_overall_duration =
BOXDATA(p_stra)->i_duration;
}
if( p_sys->i_timescale == 0 )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: fix built-in samplesize rounding
vlc | branch: master | Francois Cartegnie | Fri Jun 12 15:08:55 2015 +0200| [3dcf2fdab4bfea9c75a5633382f6de472083a996] | committer: Francois Cartegnie demux: mp4: fix built-in samplesize rounding > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3dcf2fdab4bfea9c75a5633382f6de472083a996 --- modules/demux/mp4/mp4.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 9294901..45b0825 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -3036,7 +3036,7 @@ static inline uint32_t MP4_GetFixedSampleSize( const mp4_track_t *p_track, case ATOM_twos: case ATOM_sowt: case ATOM_raw: -i_size = p_soun->i_samplesize * p_soun->i_channelcount / 8; +i_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount; break; default: break; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: move alaw/ulaw builtin codec fixes out of es setup
vlc | branch: master | Francois Cartegnie | Fri Jun 12 15:09:20 2015 +0200| [217b607b75416248512169a96df91fa303159765] | committer: Francois Cartegnie demux: mp4: move alaw/ulaw builtin codec fixes out of es setup > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=217b607b75416248512169a96df91fa303159765 --- modules/demux/mp4/essetup.c |5 - modules/demux/mp4/mp4.c |4 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c index 2c9b7bd..cb2a169 100644 --- a/modules/demux/mp4/essetup.c +++ b/modules/demux/mp4/essetup.c @@ -422,11 +422,6 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample ) p_soun->i_bytes_per_frame = 2 * p_soun->i_channelcount; p_soun->i_bytes_per_sample = 2; break; -case VLC_CODEC_ALAW: -case VLC_FOURCC( 'u', 'l', 'a', 'w' ): -p_soun->i_samplesize = 8; -p_track->i_sample_size = p_soun->i_channelcount; -break; case VLC_FOURCC( 'N', 'O', 'N', 'E' ): case VLC_FOURCC( 'r', 'a', 'w', ' ' ): case VLC_FOURCC( 't', 'w', 'o', 's' ): diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 45b0825..c01730d 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -3038,6 +3038,10 @@ static inline uint32_t MP4_GetFixedSampleSize( const mp4_track_t *p_track, case ATOM_raw: i_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount; break; +case VLC_CODEC_ALAW: +case VLC_FOURCC( 'u', 'l', 'a', 'w' ): +i_size = p_soun->i_channelcount; +break; default: break; } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: add some const to box refs
vlc | branch: master | Francois Cartegnie | Sat Jun 13
13:19:10 2015 +0200| [ae78856f6dd5acb091919cac982369ae138ff6e7] | committer:
Francois Cartegnie
demux: mp4: add some const to box refs
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ae78856f6dd5acb091919cac982369ae138ff6e7
---
modules/demux/mp4/mp4.c | 43 ++-
modules/demux/mp4/mp4.h | 18 +-
2 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 18de00a..e1096a7 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2631,17 +2631,6 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
p_track->p_track = p_box_trak;
-MP4_Box_t *p_tkhd = MP4_BoxGet( p_box_trak, "tkhd" );
-MP4_Box_t *p_tref = MP4_BoxGet( p_box_trak, "tref" );
-MP4_Box_t *p_elst;
-
-MP4_Box_t *p_mdhd;
-MP4_Box_t *p_udta;
-MP4_Box_t *p_hdlr;
-
-MP4_Box_t *p_vmhd;
-MP4_Box_t *p_smhd;
-
char language[4] = { '\0' };
/* hint track unsupported */
@@ -2655,6 +2644,7 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
es_format_Init( &p_track->fmt, UNKNOWN_ES, 0 );
+const MP4_Box_t *p_tkhd = MP4_BoxGet( p_box_trak, "tkhd" );
if( !p_tkhd )
{
return;
@@ -2672,13 +2662,10 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
p_track->i_height = BOXDATA(p_tkhd)->i_height / BLOCK16x16;
p_track->f_rotation = BOXDATA(p_tkhd)->f_rotation;
-if( p_tref )
-{
-/*msg_Warn( p_demux, "unhandled box: tref --> FIXME" ); */
-}
+/* FIXME: unhandled box: tref */
-p_mdhd = MP4_BoxGet( p_box_trak, "mdia/mdhd" );
-p_hdlr = MP4_BoxGet( p_box_trak, "mdia/hdlr" );
+const MP4_Box_t *p_mdhd = MP4_BoxGet( p_box_trak, "mdia/mdhd" );
+const MP4_Box_t *p_hdlr = MP4_BoxGet( p_box_trak, "mdia/hdlr" );
if( ( !p_mdhd )||( !p_hdlr ) )
{
@@ -2695,7 +2682,7 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
switch( p_hdlr->data.p_hdlr->i_handler_type )
{
case( ATOM_soun ):
-if( !( p_smhd = MP4_BoxGet( p_box_trak, "mdia/minf/smhd" ) ) )
+if( !MP4_BoxGet( p_box_trak, "mdia/minf/smhd" ) )
{
return;
}
@@ -2703,7 +2690,7 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
break;
case( ATOM_vide ):
-if( !( p_vmhd = MP4_BoxGet( p_box_trak, "mdia/minf/vmhd" ) ) )
+if( !MP4_BoxGet( p_box_trak, "mdia/minf/vmhd") )
{
return;
}
@@ -2726,6 +2713,7 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
return;
}
+const MP4_Box_t *p_elst;
p_track->i_elst = 0;
p_track->i_elst_time = 0;
if( ( p_track->p_elst = p_elst = MP4_BoxGet( p_box_trak, "edts/elst" ) ) )
@@ -2764,10 +2752,10 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
p_track->fmt.psz_language = strdup( language );
}
-p_udta = MP4_BoxGet( p_box_trak, "udta" );
+const MP4_Box_t *p_udta = MP4_BoxGet( p_box_trak, "udta" );
if( p_udta )
{
-MP4_Box_t *p_box_iter;
+const MP4_Box_t *p_box_iter;
for( p_box_iter = p_udta->p_first; p_box_iter != NULL;
p_box_iter = p_box_iter->p_next )
{
@@ -2871,19 +2859,8 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
p_track->i_track_ID );
return;
}
-p_track->b_ok = true;
-#if 0
-{
-int i;
-for( i = 0; i < p_track->i_chunk_count; i++ )
-{
-fprintf( stderr, "%-5d sample_count=%d pts=%lld\n",
- i, p_track->chunk[i].i_sample_count,
- p_track->chunk[i].i_first_dts );
-}
-}
-#endif
+p_track->b_ok = p_track->b_chapter || !!p_track->p_es;
}
static void FreeAndResetChunk( mp4_chunk_t *ck )
diff --git a/modules/demux/mp4/mp4.h b/modules/demux/mp4/mp4.h
index 02a2ead..5f9ce35 100644
--- a/modules/demux/mp4/mp4.h
+++ b/modules/demux/mp4/mp4.h
@@ -94,7 +94,7 @@ typedef struct
/* elst */
int i_elst; /* current elst */
int64_t i_elst_time;/* current elst start time (in movie time
scale)*/
-MP4_Box_t *p_elst;/* elst (could be NULL) */
+const MP4_Box_t *p_elst;/* elst (could be NULL) */
/* give the next sample to read, i_chunk is to find quickly where
the sample is located */
@@ -118,10 +118,10 @@ typedef struct
uint64_t i_first_dts;/* i_first_dts value
of the next chunk */
-MP4_Box_t *p_track;
-MP4_Box_t *p_stbl; /* will contain all timing information */
-MP4_Box_t *p_stsd; /* will contain all data to initia
[vlc-commits] demux: mp4: don't create unknown es on bad handler
vlc | branch: master | Francois Cartegnie | Sat Jun 13
13:18:01 2015 +0200| [b79c2d50353bfc269922020ea6efd515aa9d21aa] | committer:
Francois Cartegnie
demux: mp4: don't create unknown es on bad handler
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b79c2d50353bfc269922020ea6efd515aa9d21aa
---
modules/demux/mp4/mp4.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 89e60b1..18de00a 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2381,7 +2381,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t
*p_track,
{
case VIDEO_ES:
if ( !p_sample->data.p_sample_vide || p_sample->i_handler != ATOM_vide
)
-break;
+return VLC_EGENERIC;
SetupVideoES( p_demux, p_track, p_sample );
/* Set frame rate */
@@ -2397,13 +2397,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t
*p_track,
case AUDIO_ES:
if ( !p_sample->data.p_sample_soun || p_sample->i_handler != ATOM_soun
)
-break;
+return VLC_EGENERIC;
SetupAudioES( p_demux, p_track, p_sample );
break;
case SPU_ES:
if ( !p_sample->data.p_sample_text || p_sample->i_handler != ATOM_text
)
-break;
+return VLC_EGENERIC;
SetupSpuES( p_demux, p_track, p_sample );
default:
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: simplify destroy/release stuff
vlc | branch: master | Francois Cartegnie | Sat Jun 13
14:28:31 2015 +0200| [acc5cdf98d6e7120cbc3c15b19cfd3b8b135ef39] | committer:
Francois Cartegnie
demux: mp4: simplify destroy/release stuff
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=acc5cdf98d6e7120cbc3c15b19cfd3b8b135ef39
---
modules/demux/mp4/mp4.c | 53 +--
1 file changed, 24 insertions(+), 29 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index e1096a7..d71de57 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1718,7 +1718,7 @@ static void Close ( vlc_object_t * p_this )
{
MP4_TrackDestroy( p_demux, &p_sys->track[i_track] );
}
-FREENULL( p_sys->track );
+free( p_sys->track );
if( p_sys->p_title )
vlc_input_title_Delete( p_sys->p_title );
@@ -2863,17 +2863,20 @@ static void MP4_TrackCreate( demux_t *p_demux,
mp4_track_t *p_track,
p_track->b_ok = p_track->b_chapter || !!p_track->p_es;
}
-static void FreeAndResetChunk( mp4_chunk_t *ck )
+static void DestroyChunk( mp4_chunk_t *ck )
{
free( ck->p_sample_count_dts );
free( ck->p_sample_delta_dts );
free( ck->p_sample_count_pts );
free( ck->p_sample_offset_pts );
+
+if( ck->p_sample_data )
+{
+for( uint32_t i = 0; i < ck->i_sample_count; i++ )
+free( ck->p_sample_data[i] );
+free( ck->p_sample_data );
+}
free( ck->p_sample_size );
-for( uint32_t i = 0; i < ck->i_sample_count; i++ )
-free( ck->p_sample_data[i] );
-free( ck->p_sample_data );
-memset( ck, 0, sizeof( mp4_chunk_t ) );
}
/
@@ -2883,39 +2886,28 @@ static void FreeAndResetChunk( mp4_chunk_t *ck )
/
static void MP4_TrackDestroy( demux_t *p_demux, mp4_track_t *p_track )
{
-unsigned int i_chunk;
-
-p_track->b_ok = false;
-p_track->b_enable = false;
-p_track->b_selected = false;
-
es_format_Clean( &p_track->fmt );
if( p_track->p_es )
es_out_Del( p_demux->out, p_track->p_es );
-for( i_chunk = 0; i_chunk < p_track->i_chunk_count; i_chunk++ )
+if( p_track->chunk )
{
-if( p_track->chunk )
-{
- FREENULL(p_track->chunk[i_chunk].p_sample_count_dts);
- FREENULL(p_track->chunk[i_chunk].p_sample_delta_dts );
-
- FREENULL(p_track->chunk[i_chunk].p_sample_count_pts);
- FREENULL(p_track->chunk[i_chunk].p_sample_offset_pts );
-}
-}
-FREENULL( p_track->chunk );
-if( p_track->cchunk ) {
-FreeAndResetChunk( p_track->cchunk );
-FREENULL( p_track->cchunk );
+for( unsigned int i_chunk = 0; i_chunk < p_track->i_chunk_count;
i_chunk++ )
+DestroyChunk( &p_track->chunk[i_chunk] );
}
+free( p_track->chunk );
-if( !p_track->i_sample_size )
+if( p_track->cchunk )
{
-FREENULL( p_track->p_sample_size );
+assert( p_demux->p_sys->b_fragmented );
+DestroyChunk( p_track->cchunk );
+free( p_track->cchunk );
}
+if( !p_track->i_sample_size )
+free( p_track->p_sample_size );
+
if ( p_track->asfinfo.p_frame )
block_ChainRelease( p_track->asfinfo.p_frame );
}
@@ -3700,7 +3692,10 @@ static int MP4_frg_GetChunk( demux_t *p_demux, MP4_Box_t
*p_chunk, unsigned *i_t
FlushChunk( p_demux, p_track );
if( ret->i_sample_count )
-FreeAndResetChunk( ret );
+{
+DestroyChunk( ret );
+memset( ret, 0, sizeof(*ret) );
+}
MP4_Box_t *p_trun = MP4_BoxGet( p_traf, "trun");
if( p_trun == NULL)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: move built-in sample size fixes out from es setup
vlc | branch: master | Francois Cartegnie | Fri Jun 12
16:17:29 2015 +0200| [dc526f0a6783ed688001cabe206fb5033be01006] | committer:
Francois Cartegnie
demux: mp4: move built-in sample size fixes out from es setup
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dc526f0a6783ed688001cabe206fb5033be01006
---
modules/demux/mp4/essetup.c |7 ---
modules/demux/mp4/mp4.c |3 ++-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index cb2a169..5ba3950 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -422,13 +422,6 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track,
MP4_Box_t *p_sample )
p_soun->i_bytes_per_frame = 2 * p_soun->i_channelcount;
p_soun->i_bytes_per_sample = 2;
break;
-case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
-case VLC_FOURCC( 'r', 'a', 'w', ' ' ):
-case VLC_FOURCC( 't', 'w', 'o', 's' ):
-case VLC_FOURCC( 's', 'o', 'w', 't' ):
-/* What would be the fun if you could trust the .mov */
-p_track->i_sample_size = ((p_soun->i_samplesize+7)/8) *
p_soun->i_channelcount;
-break;
default:
p_track->fmt.i_codec = p_sample->i_type;
break;
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index c01730d..4331465 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3026,13 +3026,14 @@ static inline uint32_t MP4_GetFixedSampleSize( const
mp4_track_t *p_track,
/* QuickTime "built-in" support case fixups */
if( p_track->fmt.i_cat == AUDIO_ES &&
-p_soun->i_compressionid == 0 && p_track->i_sample_size == 1 )
+p_soun->i_compressionid == 0 && (p_track->i_sample_size == 1 ||
p_track->i_sample_size == 1) )
{
switch( p_track->fmt.i_codec )
{
case VLC_CODEC_GSM:
i_size = p_soun->i_channelcount;
break;
+case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
case ATOM_twos:
case ATOM_sowt:
case ATOM_raw:
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: rewrite and strengthen the restart stuff
vlc | branch: master | Francois Cartegnie | Sat Jun 13 14:51:53 2015 +0200| [c26b4106182d134e60ec0a39f6180c70e9bd5389] | committer: Francois Cartegnie demux: mp4: rewrite and strengthen the restart stuff Also adds the missing restart on MP4Leaf demux mode > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c26b4106182d134e60ec0a39f6180c70e9bd5389 --- modules/demux/mp4/mp4.c | 226 ++- 1 file changed, 144 insertions(+), 82 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=c26b4106182d134e60ec0a39f6180c70e9bd5389 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: remove unused members
vlc | branch: master | Francois Cartegnie | Fri Jun 12 17:21:31 2015 +0200| [8c2c3ac8712635438699903ea54cde6cd29acc0b] | committer: Francois Cartegnie demux: mp4: remove unused members > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c2c3ac8712635438699903ea54cde6cd29acc0b --- modules/demux/mp4/mp4.c |1 - modules/demux/mp4/mp4.h |4 2 files changed, 5 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 4331465..aa9c1cb 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -109,7 +109,6 @@ struct demux_sys_t asf_packet_sys_t asfpacketsys; uint64_t i_preroll; /* foobar */ int64_t i_preroll_start; -mp4_track_t *p_current_track; /* avoids matching stream_number */ }; /* diff --git a/modules/demux/mp4/mp4.h b/modules/demux/mp4/mp4.h index 798cd9e..02a2ead 100644 --- a/modules/demux/mp4/mp4.h +++ b/modules/demux/mp4/mp4.h @@ -90,7 +90,6 @@ typedef struct /* more internal data */ uint32_ti_timescale;/* time scale for this track only */ -uint16_tcurrent_qid;/* Smooth Streaming quality level ID */ /* elst */ int i_elst; /* current elst */ @@ -124,11 +123,8 @@ typedef struct MP4_Box_t *p_stsd; /* will contain all data to initialize decoder */ MP4_Box_t *p_sample;/* point on actual sdsd */ -bool b_drms; bool b_has_non_empty_cchunk; bool b_codec_need_restart; -void *p_drms; -MP4_Box_t *p_skcr; mtime_t i_time; // track scaled ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] npapi: don't return an error if string is empty
npapi-vlc | branch: master | Daniel Amm | Mon Jun 8
19:22:10 2015 +0200| [c3909b946c9a209e42cffed89f1ff059915520cd] | committer:
Jean-Baptiste Kempf
npapi: don't return an error if string is empty
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=c3909b946c9a209e42cffed89f1ff059915520cd
---
npapi/npruntime/npolibvlc.cpp | 15 +++
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/npapi/npruntime/npolibvlc.cpp b/npapi/npruntime/npolibvlc.cpp
index 246fac3..d6f60f3 100644
--- a/npapi/npruntime/npolibvlc.cpp
+++ b/npapi/npruntime/npolibvlc.cpp
@@ -1341,11 +1341,7 @@ LibvlcVideoNPObject::getProperty(int index,
npapi::OutVariant& result)
}
case ID_video_aspectratio:
{
-auto ar = mp.aspectRatio();
-if( ar.empty() )
-return INVOKERESULT_GENERIC_ERROR;
-
-result = ar;
+result = mp.aspectRatio();
return INVOKERESULT_NO_ERROR;
}
case ID_video_subtitle:
@@ -1355,11 +1351,7 @@ LibvlcVideoNPObject::getProperty(int index,
npapi::OutVariant& result)
}
case ID_video_crop:
{
-auto geo = mp.cropGeometry();
-if( geo.empty() )
-return INVOKERESULT_GENERIC_ERROR;
-
-result = geo;
+result = mp.cropGeometry();
return INVOKERESULT_NO_ERROR;
}
case ID_video_teletext:
@@ -1592,8 +1584,7 @@ LibvlcMarqueeNPObject::getProperty(int index,
npapi::OutVariant& result)
return INVOKERESULT_NO_ERROR;
case ID_marquee_text:
-auto marquee = mp.marqueeString( libvlc_marquee_Text );
-result = marquee;
+result = mp.marqueeString( libvlc_marquee_Text );
return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_GENERIC_ERROR;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins: remove dead code
vlc | branch: master | Rémi Denis-Courmont | Fri Jun 12
23:22:31 2015 +0300| [df2ecdd49c474b91bacc919d911d0a9f540ed61d] | committer:
Rémi Denis-Courmont
skins: remove dead code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df2ecdd49c474b91bacc919d911d0a9f540ed61d
---
modules/gui/skins2/src/skin_common.hpp | 10 --
1 file changed, 10 deletions(-)
diff --git a/modules/gui/skins2/src/skin_common.hpp
b/modules/gui/skins2/src/skin_common.hpp
index 8b880bb..3388f72 100644
--- a/modules/gui/skins2/src/skin_common.hpp
+++ b/modules/gui/skins2/src/skin_common.hpp
@@ -87,16 +87,6 @@ static inline string sFromWide( const wstring &rWide )
}
#endif
-/// Wrapper around ToLocale, to avoid the need to call LocaleFree()
-static inline string sToLocale( const string &rUTF8 )
-{
-const char *s = ToLocale( rUTF8.c_str() );
-string res = s;
-LocaleFree( s );
-return res;
-}
-
-
//---
// intf_sys_t: description and status of skin interface
//---
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] os2: inline ToLocale/LocaleFree
vlc | branch: master | Rémi Denis-Courmont | Fri Jun 12
23:27:23 2015 +0300| [0974fd35bbbec00406b05c355fbe2791745ec32d] | committer:
Rémi Denis-Courmont
os2: inline ToLocale/LocaleFree
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0974fd35bbbec00406b05c355fbe2791745ec32d
---
src/os2/filesystem.c | 32
src/os2/plugin.c |6 +++---
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/os2/filesystem.c b/src/os2/filesystem.c
index 51a4447..5017abe 100644
--- a/src/os2/filesystem.c
+++ b/src/os2/filesystem.c
@@ -65,7 +65,7 @@ int vlc_open (const char *filename, int flags, ...)
mode = va_arg (ap, unsigned int);
va_end (ap);
-const char *local_name = ToLocale (filename);
+const char *local_name = ToLocaleDup (filename);
if (local_name == NULL)
{
@@ -77,7 +77,7 @@ int vlc_open (const char *filename, int flags, ...)
if (fd != -1)
fcntl (fd, F_SETFD, FD_CLOEXEC);
-LocaleFree (local_name);
+free (local_name);
return fd;
}
@@ -109,7 +109,7 @@ int vlc_openat (int dir, const char *filename, int flags,
...)
*/
int vlc_mkdir (const char *dirname, mode_t mode)
{
-char *locname = ToLocale (dirname);
+char *locname = ToLocaleDup (dirname);
if (unlikely(locname == NULL))
{
errno = ENOENT;
@@ -117,7 +117,7 @@ int vlc_mkdir (const char *dirname, mode_t mode)
}
int res = mkdir (locname, mode);
-LocaleFree (locname);
+free (locname);
return res;
}
@@ -130,7 +130,7 @@ int vlc_mkdir (const char *dirname, mode_t mode)
*/
DIR *vlc_opendir (const char *dirname)
{
-const char *locname = ToLocale (dirname);
+const char *locname = ToLocaleDup (dirname);
if (unlikely(locname == NULL))
{
errno = ENOENT;
@@ -139,7 +139,7 @@ DIR *vlc_opendir (const char *dirname)
DIR *dir = opendir (locname);
-LocaleFree (locname);
+free (locname);
return dir;
}
@@ -180,14 +180,14 @@ char *vlc_readdir( DIR *dir )
if (val != 0)
errno = val;
else if (ent != NULL)
-path = FromLocaleDup (ent->d_name);
+path = FromCharset ("", ent->d_name, strlen(ent->d_name));
free (buf);
return path;
}
static int vlc_statEx (const char *filename, struct stat *buf, bool deref)
{
-const char *local_name = ToLocale (filename);
+const char *local_name = ToLocaleDup (filename);
if (unlikely(local_name == NULL))
{
errno = ENOENT;
@@ -196,7 +196,7 @@ static int vlc_statEx (const char *filename, struct stat
*buf, bool deref)
int res = deref ? stat (local_name, buf)
: lstat (local_name, buf);
-LocaleFree (local_name);
+free (local_name);
return res;
}
@@ -231,7 +231,7 @@ int vlc_lstat (const char *filename, struct stat *buf)
*/
int vlc_unlink (const char *filename)
{
-const char *local_name = ToLocale (filename);
+const char *local_name = ToLocaleDup (filename);
if (unlikely(local_name == NULL))
{
errno = ENOENT;
@@ -239,7 +239,7 @@ int vlc_unlink (const char *filename)
}
int ret = unlink (local_name);
-LocaleFree (local_name);
+free (local_name);
return ret;
}
@@ -253,22 +253,22 @@ int vlc_unlink (const char *filename)
*/
int vlc_rename (const char *oldpath, const char *newpath)
{
-const char *lo = ToLocale (oldpath);
+const char *lo = ToLocaleDup (oldpath);
if (lo == NULL)
goto error;
-const char *ln = ToLocale (newpath);
+const char *ln = ToLocaleDup (newpath);
if (ln == NULL)
{
-LocaleFree (lo);
+free (lo);
error:
errno = ENOENT;
return -1;
}
int ret = rename (lo, ln);
-LocaleFree (lo);
-LocaleFree (ln);
+free (lo);
+free (ln);
return ret;
}
diff --git a/src/os2/plugin.c b/src/os2/plugin.c
index c16b827..d24e26b 100644
--- a/src/os2/plugin.c
+++ b/src/os2/plugin.c
@@ -49,16 +49,16 @@ int module_Load( vlc_object_t *p_this, const char *psz_file,
module_handle_t *p_handle, bool lazy )
{
const int flags = lazy ? RTLD_LAZY : RTLD_NOW;
-char *path = ToLocale( psz_file );
+char *path = ToLocaleDup( psz_file );
module_handle_t handle = dlopen( path, flags );
if( handle == NULL )
{
msg_Warn( p_this, "cannot load module `%s' (%s)", path, dlerror() );
-LocaleFree( path );
+free( path );
return -1;
}
-LocaleFree( path );
+free( path );
*p_handle = handle;
return 0;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] config: assume UTF-8 vlcrc
vlc | branch: master | Rémi Denis-Courmont | Fri Jun 12
23:16:17 2015 +0300| [a6e49e68a0f8772999bbcf2918da2f2ec117e83d] | committer:
Rémi Denis-Courmont
config: assume UTF-8 vlcrc
8 and a half years should have been enough to transition.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6e49e68a0f8772999bbcf2918da2f2ec117e83d
---
src/config/file.c | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/config/file.c b/src/config/file.c
index b445698..3c1712a 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -174,16 +174,10 @@ int config_LoadConfigFile( vlc_object_t *p_this )
if (file == NULL)
return VLC_EGENERIC;
-/* Look for UTF-8 Byte Order Mark */
-char * (*convert) (const char *) = strdupnull;
+/* Skip UTF-8 Byte Order Mark if present */
char bom[3];
-
-if ((fread (bom, 1, 3, file) != 3)
- || memcmp (bom, "\xEF\xBB\xBF", 3))
-{
-convert = FromLocaleDup;
+if (fread (bom, 1, 3, file) != 3 || memcmp (bom, "\xEF\xBB\xBF", 3))
rewind (file); /* no BOM, rewind */
-}
char *line = NULL;
size_t bufsize;
@@ -243,7 +237,7 @@ int config_LoadConfigFile( vlc_object_t *p_this )
default:
free ((char *)item->value.psz);
-item->value.psz = convert (psz_option_value);
+item->value.psz = strdupnull (psz_option_value);
break;
}
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libarchive: build a minimal version
vlc | branch: master | Jean-Baptiste Kempf | Sat Jun 13 17:28:47 2015 +0200| [8309626d8ea347c403284a6cd1a6478a6a0d4f1b] | committer: Jean-Baptiste Kempf libarchive: build a minimal version > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8309626d8ea347c403284a6cd1a6478a6a0d4f1b --- contrib/src/libarchive/rules.mak |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak index 32c470b..181e055 100644 --- a/contrib/src/libarchive/rules.mak +++ b/contrib/src/libarchive/rules.mak @@ -7,8 +7,6 @@ ifeq ($(call need_pkg,"libarchive >= 3.1.0"),) PKGS_FOUND += libarchive endif -DEPS_libarchive = libxml2 - $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz: $(call download,$(LIBARCHIVE_URL)) @@ -21,6 +19,7 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive .libarchive: libarchive cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \ - --disable-bsdcpio --disable-bsdtar --without-nettle + --disable-bsdcpio --disable-bsdtar --without-nettle --without-bz2lib \ + --without-xml2 --without-lzmadec --without-iconv --without-expat cd $< && $(MAKE) install touch $@ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins2: replace unlink with vlc_unlink
vlc/vlc-2.2 | branch: master | Erwan Tulou | Sat Jun 13 14:13:01 2015 +0200| [0f4bb9c024c6ce759b53a778b46157e8dcd6b7d0] | committer: Erwan Tulou skins2: replace unlink with vlc_unlink (cherry picked from commit 5e3c93f14aa5084101b1a0adf527016b3a86904c) Signed-off-by: Erwan Tulou > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0f4bb9c024c6ce759b53a778b46157e8dcd6b7d0 --- modules/gui/skins2/src/theme_loader.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp index ae983a3..a8d2725 100644 --- a/modules/gui/skins2/src/theme_loader.cpp +++ b/modules/gui/skins2/src/theme_loader.cpp @@ -640,7 +640,7 @@ int tar_extract_all( TAR *t, char *prefix ) fprintf( stderr, "error writing %s skipping...\n", fname ); fclose( outfile ); outfile = NULL; -unlink( fname ); +vlc_unlink( fname ); } } remaining -= bytes; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins2(Linux): replace tempnam() with mkdtemp()
vlc/vlc-2.2 | branch: master | Erwan Tulou | Sat Jun 13
15:29:25 2015 +0200| [150ac49cf2a2904f4bf5783e4dac84a38e53626d] | committer:
Erwan Tulou
skins2(Linux): replace tempnam() with mkdtemp()
Linux manual strongly advises against using tempnam().
(cherry picked from commit 27cb7a2eddae5bd4e730ca7fff5b05cffd1b691c)
Signed-off-by: Erwan Tulou
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=150ac49cf2a2904f4bf5783e4dac84a38e53626d
---
modules/gui/skins2/src/theme_loader.cpp | 28 +---
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/modules/gui/skins2/src/theme_loader.cpp
b/modules/gui/skins2/src/theme_loader.cpp
index a8d2725..e54f999 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -817,29 +817,27 @@ string ThemeLoader::getTmpDir( )
{
#if defined( _WIN32 )
wchar_t *tmpdir = _wtempnam( NULL, L"vlt" );
-#else
-char *tmpdir = tempnam( NULL, "vlt" );
-#endif
if( tmpdir == NULL )
return "";
-
-#if defined( _WIN32 )
char* utf8 = FromWide( tmpdir );
-if( utf8 == NULL )
-{
-free( tmpdir );
-return "";
-}
-string tempPath( utf8 );
+free( tmpdir );
+string tempPath( utf8 ? utf8 : "" );
free( utf8 );
+return tempPath;
+
#elif defined( __OS2__ )
+char *tmpdir = tempnam( NULL, "vlt" );
+if( tmpdir == NULL )
+return "";
string tempPath( sFromLocale( tmpdir ));
-#else
-string tempPath( tmpdir );
-#endif
-
free( tmpdir );
return tempPath;
+
+#else
+char templ[] = "/tmp/vltXX";
+char *tmpdir = mkdtemp( templ );
+return string( tmpdir ? tmpdir : "");
+#endif
}
#endif
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins2: replace unlink with vlc_unlink
vlc | branch: master | Erwan Tulou | Sat Jun 13 14:13:01 2015 +0200| [5e3c93f14aa5084101b1a0adf527016b3a86904c] | committer: Erwan Tulou skins2: replace unlink with vlc_unlink > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e3c93f14aa5084101b1a0adf527016b3a86904c --- modules/gui/skins2/src/theme_loader.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp index ae983a3..a8d2725 100644 --- a/modules/gui/skins2/src/theme_loader.cpp +++ b/modules/gui/skins2/src/theme_loader.cpp @@ -640,7 +640,7 @@ int tar_extract_all( TAR *t, char *prefix ) fprintf( stderr, "error writing %s skipping...\n", fname ); fclose( outfile ); outfile = NULL; -unlink( fname ); +vlc_unlink( fname ); } } remaining -= bytes; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] skins2(Linux): replace tempnam() with mkdtemp()
vlc | branch: master | Erwan Tulou | Sat Jun 13 15:29:25
2015 +0200| [27cb7a2eddae5bd4e730ca7fff5b05cffd1b691c] | committer: Erwan Tulou
skins2(Linux): replace tempnam() with mkdtemp()
Linux manual strongly advises against using tempnam().
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=27cb7a2eddae5bd4e730ca7fff5b05cffd1b691c
---
modules/gui/skins2/src/theme_loader.cpp | 28 +---
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/modules/gui/skins2/src/theme_loader.cpp
b/modules/gui/skins2/src/theme_loader.cpp
index a8d2725..e54f999 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -817,29 +817,27 @@ string ThemeLoader::getTmpDir( )
{
#if defined( _WIN32 )
wchar_t *tmpdir = _wtempnam( NULL, L"vlt" );
-#else
-char *tmpdir = tempnam( NULL, "vlt" );
-#endif
if( tmpdir == NULL )
return "";
-
-#if defined( _WIN32 )
char* utf8 = FromWide( tmpdir );
-if( utf8 == NULL )
-{
-free( tmpdir );
-return "";
-}
-string tempPath( utf8 );
+free( tmpdir );
+string tempPath( utf8 ? utf8 : "" );
free( utf8 );
+return tempPath;
+
#elif defined( __OS2__ )
+char *tmpdir = tempnam( NULL, "vlt" );
+if( tmpdir == NULL )
+return "";
string tempPath( sFromLocale( tmpdir ));
-#else
-string tempPath( tmpdir );
-#endif
-
free( tmpdir );
return tempPath;
+
+#else
+char templ[] = "/tmp/vltXX";
+char *tmpdir = mkdtemp( templ );
+return string( tmpdir ? tmpdir : "");
+#endif
}
#endif
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: disable isVisibleOnLaunch for main window
vlc/vlc-2.2 | branch: master | David Fuhrmann | Sat Jun 13 11:14:23 2015 +0200| [4dc9d044b328195e913650fe1cb91b7e868a2053] | committer: David Fuhrmann macosx: disable isVisibleOnLaunch for main window Manual and partly cherry-pick of 43822a61f7be5bb1f9b5c74d470ae57f14c80109 close #9903 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4dc9d044b328195e913650fe1cb91b7e868a2053 --- .../macosx/Resources/English.lproj/MainWindow.xib | 92 1 file changed, 15 insertions(+), 77 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=4dc9d044b328195e913650fe1cb91b7e868a2053 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix checked state for extensions (close #14855)
vlc/vlc-2.2 | branch: master | David Fuhrmann | Thu
Jun 11 19:14:50 2015 +0200| [1ab29cfa0cb0222a19ffba7d09476553f1fc64dc] |
committer: David Fuhrmann
macosx: fix checked state for extensions (close #14855)
(cherry picked from commit d768b02e609ec5c3295c09a54dd6dd425df687b1)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1ab29cfa0cb0222a19ffba7d09476553f1fc64dc
---
modules/gui/macosx/ExtensionsDialogProvider.m | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/modules/gui/macosx/ExtensionsDialogProvider.m
b/modules/gui/macosx/ExtensionsDialogProvider.m
index d15966c..c723ab9 100644
--- a/modules/gui/macosx/ExtensionsDialogProvider.m
+++ b/modules/gui/macosx/ExtensionsDialogProvider.m
@@ -192,9 +192,9 @@ static void updateControlFromWidget(NSView *control,
extension_widget_t *widget,
{
assert([control isKindOfClass:[NSButton class]]);
NSButton *button = (NSButton *)control;
-if (!widget->psz_text)
-break;
-[button setTitle:[NSString stringWithUTF8String:widget->psz_text]];
+[button setTitle:toNSStr(widget->psz_text)];
+if (widget->type == EXTENSION_WIDGET_CHECK_BOX)
+[button setState:widget->b_checked ? NSOnState : NSOffState];
break;
}
case EXTENSION_WIDGET_DROPDOWN:
@@ -342,7 +342,10 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
extension_widget_t *widget = [button widget];
vlc_mutex_lock(&widget->p_dialog->lock);
-extension_WidgetClicked(widget->p_dialog, widget);
+if (widget->type == EXTENSION_WIDGET_BUTTON)
+extension_WidgetClicked(widget->p_dialog, widget);
+else
+widget->b_checked = [button state] == NSOnState;
vlc_mutex_unlock(&widget->p_dialog->lock);
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: disable isVisibleOnLaunch and isRestorable for main window
vlc | branch: master | David Fuhrmann | Sat Jun 13
09:23:31 2015 +0200| [43822a61f7be5bb1f9b5c74d470ae57f14c80109] | committer:
David Fuhrmann
macosx: disable isVisibleOnLaunch and isRestorable for main window
This workarounds a bug in the cocoa framework.
close #9903
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43822a61f7be5bb1f9b5c74d470ae57f14c80109
---
.../macosx/Resources/English.lproj/MainWindow.xib | 50 ++--
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
index 0e3fd73..b8f5fe0 100644
--- a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
@@ -2,13 +2,13 @@
1060
- 14B25
- 6254
- 1343.16
- 755.00
+ 14D136
+ 7706
+ 1347.57
+ 758.70
com.apple.InterfaceBuilder.CocoaPlugin
- 6254
+ 7706
NSBox
@@ -90,10 +90,7 @@
{199,
272}
-
-
NSAppearanceNameVibrantLight
-
com.apple.systemappearance
-
+
YES
NO
YES
@@ -223,7 +220,6 @@
{{-100, -100}, {212, 15}}
-
NO
_doScroller:
@@ -236,7 +232,7 @@
{201, 274}
-
+
133650
@@ -402,7 +398,7 @@
{401,
236}
-
+
[vlc-commits] macosx: add build schemes to Xcode project for complete compilation
vlc | branch: master | David Fuhrmann | Sun May 31 23:22:47 2015 +0200| [c5ffebd6665a846992cd78d9274e9a441617047f] | committer: David Fuhrmann macosx: add build schemes to Xcode project for complete compilation This adds several build targets to the project for doing all needed steps for compilation. Additionally, they are some schemes included which are intended to be used for compilation: - "Rebuild everything" builds all targets in the right order, including extras/tools, contribs, bootstrap, configure, make and make VLC-dev. This scheme should be used once to setup everything. For later builds, you should switch to the Make project scheme. - "Make project" runs "make && make VLC-dev.app", to only recompile files if needed. Additionally, it creates a VLC-dev.app for testing. The end result will be stored in the build folder set in Xcode. Both VLC.app and VLC-dev.app can be accessed by using the "Build artifacts" folder, and showing the files in finder. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5ffebd6665a846992cd78d9274e9a441617047f --- .../package/macosx/vlc.xcodeproj/project.pbxproj | 824 ++-- .../xcshareddata/xcschemes/Make project.xcscheme | 82 ++ .../xcschemes/Rebuild everything.xcscheme | 142 3 files changed, 999 insertions(+), 49 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=c5ffebd6665a846992cd78d9274e9a441617047f ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: rename vlc target to vlc-bundle-helper
vlc | branch: master | David Fuhrmann | Sat Jun 13
09:28:54 2015 +0200| [ce5d8671e01237befc472818fd65211d467b7b51] | committer:
David Fuhrmann
macosx: rename vlc target to vlc-bundle-helper
This is the target called from our makefile scripts. Rename it
so it is more clear that it should not be called in Xcode
directly.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce5d8671e01237befc472818fd65211d467b7b51
---
extras/package/macosx/package.mak |2 +-
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 630eb9b..f709d81 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -45,7 +45,7 @@ VLC-tmp: vlc
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
cd "$(srcdir)/modules/gui/macosx/" && cp *.h *.m
$(abs_top_builddir)/tmp/modules/gui/macosx/
cd $(top_builddir)/tmp/extras/package/macosx && \
- xcodebuild -target vlc SYMROOT=../../../build
DSTROOT=../../../build $(silentstd)
+ xcodebuild -target vlc-bundle-helper SYMROOT=../../../build
DSTROOT=../../../build $(silentstd)
cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $@
mkdir -p $@/Contents/Frameworks && cp -R $(CONTRIB_DIR)/Growl.framework
$@/Contents/Frameworks/
if HAVE_SPARKLE
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 9b5f12f..848c7d3 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -3024,9 +3024,9 @@
productReference = 1CCB5F2F1A62A6A5004C3E90 /*
pseudo-vlc.app */;
productType = "com.apple.product-type.application";
};
- CC402EAE0E00ABBB006A4BA4 /* vlc */ = {
+ CC402EAE0E00ABBB006A4BA4 /* vlc-bundle-helper */ = {
isa = PBXNativeTarget;
- buildConfigurationList = CC402F460E00ABBB006A4BA4 /*
Build configuration list for PBXNativeTarget "vlc" */;
+ buildConfigurationList = CC402F460E00ABBB006A4BA4 /*
Build configuration list for PBXNativeTarget "vlc-bundle-helper" */;
buildPhases = (
CC402EAF0E00ABBB006A4BA4 /* Resources */,
CC402F400E00ABBB006A4BA4 /* Frameworks */,
@@ -3036,7 +3036,7 @@
);
dependencies = (
);
- name = vlc;
+ name = "vlc-bundle-helper";
productInstallPath = "$(HOME)/Library/Bundles";
productName = vlc;
productReference = CC402F4B0E00ABBB006A4BA4 /*
VLC.bundle */;
@@ -3085,7 +3085,7 @@
projectDirPath = "";
projectRoot = ../../..;
targets = (
- CC402EAE0E00ABBB006A4BA4 /* vlc */,
+ CC402EAE0E00ABBB006A4BA4 /* vlc-bundle-helper
*/,
1CCB5F2E1A62A6A5004C3E90 /* pseudo-vlc */,
1C42A6DF1B19F597007D87B2 /* Build deps */,
1C07EDFD1B1CD6B300A0BBDB /* Bootstrap project
*/,
@@ -5015,7 +5015,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- CC402F460E00ABBB006A4BA4 /* Build configuration list for
PBXNativeTarget "vlc" */ = {
+ CC402F460E00ABBB006A4BA4 /* Build configuration list for
PBXNativeTarget "vlc-bundle-helper" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CC402F470E00ABBB006A4BA4 /* Development */,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
