hrev52329 adds 3 changesets to branch 'master'
old head: 5706737797afe55794462a9864300b7ad268699f
new head: 4c7002a3d1aa23392a72e34548afeacf77396868
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=4c7002a3d1aa+%5E5706737797af
----------------------------------------------------------------------------
503d88931436: Remove the "Haiku" screensaver from the tree.
As discussed in #14447.
14162168f501: mime_db: Add entries with sniff rules for DjVu and XPS.
These formats are supported by DocumentViewer.
4c7002a3d1aa: mime_db: Add type for HEVC elementary streams.
"Elementary streams" were introduced with MPEG-2, but did not find much use
outside of internal data interchange until now, which finds some HEVC
files being actually distributed in this format.
The first four bytes (00 00 00 01) are common to all (packetized?) elementary
streams, while the three following (40 01 0c) identify a HEVC stream. Actually
I could not find good data on these; all the HEVC files I saw (and some hex-
dumps on online mailing lists of more) contain these three bytes in common
while following ones appear to be the internal header. (I didn't dig deeply
enough into FFmpeg's source code to find out the "real deal.")
Fixes #12565.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
8 files changed, 43 insertions(+), 158 deletions(-)
build/jam/images/definitions/regular | 1 -
src/add-ons/screen_savers/Jamfile | 1 -
src/add-ons/screen_savers/haiku/Jamfile | 19 ---
src/add-ons/screen_savers/haiku/ScreenSaver.cpp | 123 -------------------
src/add-ons/screen_savers/haiku/ScreenSaver.rdef | 14 ---
src/data/mime_db/application/vnd.ms-xpsdocument | 16 +++
src/data/mime_db/image/vnd.djvu | 13 ++
src/data/mime_db/video/hevc | 14 +++
############################################################################
Commit: 503d8893143608765c62b995780820dc89ae5c8f
URL: https://git.haiku-os.org/haiku/commit/?id=503d88931436
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Sep 10 23:51:02 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/14447
Remove the "Haiku" screensaver from the tree.
As discussed in #14447.
----------------------------------------------------------------------------
diff --git a/build/jam/images/definitions/regular
b/build/jam/images/definitions/regular
index 3f6e015932..9ce83e43b4 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -183,7 +183,6 @@ SYSTEM_ADD_ONS_SCREENSAVERS += [ FFilterByBuildFeatures
DebugNow
Flurry@mesa
GLife@mesa Gravity@mesa
- $(HAIKU_INCLUDE_TRADEMARKS)Haiku
Icons IFS
Leaves
Message
diff --git a/src/add-ons/screen_savers/Jamfile
b/src/add-ons/screen_savers/Jamfile
index 031c70dc0c..00fe3db861 100644
--- a/src/add-ons/screen_savers/Jamfile
+++ b/src/add-ons/screen_savers/Jamfile
@@ -5,7 +5,6 @@ SubInclude HAIKU_TOP src add-ons screen_savers debugnow ;
SubInclude HAIKU_TOP src add-ons screen_savers flurry ;
SubInclude HAIKU_TOP src add-ons screen_savers glife ;
SubInclude HAIKU_TOP src add-ons screen_savers gravity ;
-SubInclude HAIKU_TOP src add-ons screen_savers haiku ;
SubInclude HAIKU_TOP src add-ons screen_savers icons ;
SubInclude HAIKU_TOP src add-ons screen_savers ifs ;
SubInclude HAIKU_TOP src add-ons screen_savers leaves ;
diff --git a/src/add-ons/screen_savers/haiku/Jamfile
b/src/add-ons/screen_savers/haiku/Jamfile
deleted file mode 100644
index 9f8dd9e276..0000000000
--- a/src/add-ons/screen_savers/haiku/Jamfile
+++ /dev/null
@@ -1,19 +0,0 @@
-SubDir HAIKU_TOP src add-ons screen_savers haiku ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-UsePrivateHeaders screen_saver ;
- # For BuildDefaultSettingsView
-
-AddResources Haiku : ScreenSaver.rdef ;
-
-Addon Haiku :
- ScreenSaver.cpp
- : be screensaver localestub [ TargetLibsupc++ ]
-;
-
-DoCatalogs Haiku :
- x-vnd.Haiku-HaikuScreensaver
- :
- ScreenSaver.cpp
-;
diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
deleted file mode 100644
index 4bd9590f2a..0000000000
--- a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-**
-** A simple screensaver, displays the text "Haiku" at random locations.
-**
-** Version: 3.0
-**
-** Copyright (c) 2002, 2005 Marcus Overhagen. All Rights Reserved.
-** This file may be used under the terms of the MIT License.
-*/
-
-
-#include <stdlib.h>
-
-#include <Catalog.h>
-#include <DefaultSettingsView.h>
-#include <Font.h>
-#include <ScreenSaver.h>
-#include <StringView.h>
-#include <View.h>
-
-
-#undef B_TRANSLATION_CONTEXT
-#define B_TRANSLATION_CONTEXT "Screensaver Haiku"
-
-
-class ScreenSaver : public BScreenSaver
-{
-public:
- ScreenSaver(BMessage *archive, image_id);
- void Draw(BView *view, int32 frame);
- void StartConfig(BView *view);
- status_t StartSaver(BView *view, bool preview);
-
-private:
- const char *fText;
- float fX;
- float fY;
- float fSizeX;
- float fSizeY;
- float fTextHeight;
- float fTextWith;
- bool fIsPreview;
-};
-
-
-BScreenSaver *instantiate_screen_saver(BMessage *msg, image_id image)
-{
- return new ScreenSaver(msg, image);
-}
-
-
-ScreenSaver::ScreenSaver(BMessage *archive, image_id id)
- : BScreenSaver(archive, id)
- , fText("Haiku")
- , fX(0)
- , fY(0)
-{
-}
-
-
-void
-ScreenSaver::StartConfig(BView *view)
-{
- BPrivate::BuildDefaultSettingsView(view, "Haiku",
- B_TRANSLATE("by Marcus Overhagen"));
-}
-
-
-status_t
-ScreenSaver::StartSaver(BView *view, bool preview)
-{
- // save view dimensions and preview mode
- fIsPreview = preview;
- fSizeX = view->Bounds().Width();
- fSizeY = view->Bounds().Height();
-
- // set a new font, about 1/8th of view height, and bold
- BFont font;
- view->GetFont(&font);
- font.SetSize(fSizeY / 8);
- font.SetFace(B_BOLD_FACE);
- view->SetFont(&font);
-
- // find out space needed for text display
- BRect rect;
- escapement_delta delta;
- delta.nonspace = 0;
- delta.space = 0;
- font.GetBoundingBoxesForStrings(&fText, 1, B_SCREEN_METRIC, &delta,
&rect);
- fTextHeight = rect.Height();
- fTextWith = rect.Width();
-
- // seed the random number generator
- srand((int)system_time());
-
- return B_OK;
-}
-
-
-void
-ScreenSaver::Draw(BView *view, int32 frame)
-{
- if (frame == 0) {
- // fill with black on first frame
- view->SetLowColor(0, 0, 0);
- view->FillRect(view->Bounds(), B_SOLID_LOW);
- } else {
- // erase old text on all other frames
- view->SetHighColor(0, 0, 0);
- view->DrawString(fText, BPoint(fX, fY));
- }
-
- // find some new text coordinates
- fX = rand() % int(fSizeX - fTextWith);
- fY = rand() % int(fSizeY - fTextHeight - (fIsPreview ? 2 : 20)) +
fTextHeight;
-
- // draw new text
- view->SetHighColor(0, 255, 0);
- view->DrawString(fText, BPoint(fX, fY));
-
- // randomize time until next update (preview mode is faster)
- SetTickSize(((rand() % 4) + 1) * (fIsPreview ? 300000 : 1000000));
-}
diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.rdef
b/src/add-ons/screen_savers/haiku/ScreenSaver.rdef
deleted file mode 100644
index 6e346fb866..0000000000
--- a/src/add-ons/screen_savers/haiku/ScreenSaver.rdef
+++ /dev/null
@@ -1,14 +0,0 @@
-
-resource app_signature "application/x-vnd.Haiku-HaikuScreensaver";
-
-resource app_name_catalog_entry "x-vnd.Haiku-HaikuScreensaver:System
name:Haiku";
-
-resource app_version {
- major = 1,
- middle = 0,
- minor = 0,
- variety = 0,
- internal = 0,
- short_info = "1.0.0",
- long_info = "Screensaver Haiku"
-};
############################################################################
Commit: 14162168f5012596e6322540bd100db28fe4320f
URL: https://git.haiku-os.org/haiku/commit/?id=14162168f501
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Sep 11 01:56:34 2018 UTC
mime_db: Add entries with sniff rules for DjVu and XPS.
These formats are supported by DocumentViewer.
----------------------------------------------------------------------------
diff --git a/src/data/mime_db/application/vnd.ms-xpsdocument
b/src/data/mime_db/application/vnd.ms-xpsdocument
new file mode 100644
index 0000000000..be25d849a9
--- /dev/null
+++ b/src/data/mime_db/application/vnd.ms-xpsdocument
@@ -0,0 +1,16 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "application/vnd.ms-xpsdocument";
+
+resource(2, "META:SNIFF_RULE") "0.50 (\"PK\\003\\004\") [0:512]('_rels/.rels')
[0:512]('Documents/1/')";
+
+resource(3, "META:S:DESC") #'MSDC' "XPS document";
+
+resource(4, "META:L:DESC") #'MLDC' "Microsoft® XPS document";
+
+resource(5, "META:EXTENS") message(234) {
+ "extensions" = "xps",
+ "extensions" = "oxps",
+ "type" = "application/vnd.ms-xpsdocument"
+};
diff --git a/src/data/mime_db/image/vnd.djvu b/src/data/mime_db/image/vnd.djvu
new file mode 100644
index 0000000000..f0c9df9ace
--- /dev/null
+++ b/src/data/mime_db/image/vnd.djvu
@@ -0,0 +1,13 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "image/vnd.djvu";
+
+resource(2, "META:SNIFF_RULE") "0.50 ([12]'DJVU' | [12]'DJVM')";
+
+resource(3, "META:S:DESC") #'MSDC' "DjVu media format";
+
+resource(4, "META:EXTENS") message(234) {
+ "extensions" = "djvu",
+ "type" = "image/vnd.djvu"
+};
############################################################################
Revision: hrev52329
Commit: 4c7002a3d1aa23392a72e34548afeacf77396868
URL: https://git.haiku-os.org/haiku/commit/?id=4c7002a3d1aa
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Sep 11 02:26:32 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/12565
mime_db: Add type for HEVC elementary streams.
"Elementary streams" were introduced with MPEG-2, but did not find much use
outside of internal data interchange until now, which finds some HEVC
files being actually distributed in this format.
The first four bytes (00 00 00 01) are common to all (packetized?) elementary
streams, while the three following (40 01 0c) identify a HEVC stream. Actually
I could not find good data on these; all the HEVC files I saw (and some hex-
dumps on online mailing lists of more) contain these three bytes in common
while following ones appear to be the internal header. (I didn't dig deeply
enough into FFmpeg's source code to find out the "real deal.")
Fixes #12565.
----------------------------------------------------------------------------
diff --git a/src/data/mime_db/video/hevc b/src/data/mime_db/video/hevc
new file mode 100644
index 0000000000..37f9cb5a47
--- /dev/null
+++ b/src/data/mime_db/video/hevc
@@ -0,0 +1,14 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "video/hevc";
+
+resource(2, "META:SNIFF_RULE") "0.50 (0x0000000140010c)";
+
+resource(3, "META:S:DESC") #'MSDC' "HEVC elementary stream";
+
+resource(4, "META:EXTENS") message(234) {
+ "extensions" = "hevc",
+ "extensions" = "h265",
+ "type" = "video/hevc"
+};
